From 258f905e8c6b1853884f730ab0e36a544bfd7b76 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:04:08 +0200 Subject: recreated tag OOO_BUILD_3_2_98_1 which had these commits: commit aa08e6374f2a8f11105d84c3d651696be34ef78b (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek Date: Wed Sep 15 19:03:24 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit eb4914f043304ba7d164733509794104c7ea5b33 Merge: 5ada805 0815e6f Author: Jan Holesovsky Date: Tue Sep 7 09:33:00 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 0815e6f3086d4513fb1dfed2a0ff8e83a3589afc (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6) Merge: 51cfacc 1d0dc69 Author: Ivo Hinkelmann Date: Thu Aug 26 13:52:56 2010 +0200 CWS-TOOLING: integrate CWS calc58 commit 51cfacc73ee6162c82dbb735448f5321a2a57269 Merge: 1f33e95 8676b47 Author: Ivo Hinkelmann Date: Wed Aug 25 12:49:35 2010 +0200 CWS-TOOLING: integrate CWS mib18 commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a Author: Thomas Benisch Date: Fri Aug 20 13:23:46 2010 +0200 calc58: #i113948# office crashes after resizing chart chart2/source/model/main/ChartModel.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit db48b114e54b6ceaebd4d77fbb0de1d41a0d69ca Author: Thomas Benisch Date: Fri Aug 20 13:03:55 2010 +0200 calc58: #i113946# undo does not work for deleting shapes .../controller/main/ChartController_Tools.cxx | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) commit 3fa83707418cb221c94dcbe32864e5555b618159 Author: Eike Rathke [er] Date: Thu Aug 19 17:12:37 2010 +0200 calc58: #i113879# add ScMatrix::CloneIfConst() and regard only temporary matrices created by the interpreter as mutable sc/inc/scmatrix.hxx | 11 ++++++++++- sc/source/core/tool/interpr4.cxx | 7 ++++++- sc/source/core/tool/interpr5.cxx | 21 +++++++++++++-------- sc/source/core/tool/scmatrix.cxx | 5 +++++ 4 files changed, 34 insertions(+), 10 deletions(-) commit baac8ebc6989a5771b5d1903e5e8f4014ecafeac Author: Eike Rathke [er] Date: Wed Aug 18 18:56:10 2010 +0200 calc58: #i113739# make N return 0 for all strings again sc/source/core/tool/interpr1.cxx | 23 +++++++---------------- sc/source/core/tool/interpr4.cxx | 6 ++++++ 2 files changed, 13 insertions(+), 16 deletions(-) commit ac9660fc7e47b2a7eecdb0c749ee46f592a70635 Author: Eike Rathke [er] Date: Wed Aug 18 16:52:22 2010 +0200 calc58: #i113820# make TEXT treat string results and inline strings identical to referenced cell text sc/source/core/tool/interpr1.cxx | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 8676b47d16a1670a4d6ebbc610e8a00abd2367f7 Merge: 6423ab8 1f33e95 Author: Daniel Rentz Date: Fri Aug 13 11:29:46 2010 +0200 mib18: rebase to OOO330m4 commit 6423ab81e71f7090d61e81b8992878ce7de43f27 Merge: 6e0de89 772dd5e Author: Andreas Bregas Date: Wed Aug 11 08:28:57 2010 +0200 mib18: Merge commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240 Author: Daniel Rentz Date: Tue Aug 10 20:18:10 2010 +0200 mib18: adjusted service name to match VBA symbol sc/source/ui/vba/vbaglobals.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9725c306fd4502fc6de7d4acf5c302427310a20d Author: Michael E. Bohn Date: Tue Aug 10 18:14:58 2010 +0200 mib18: #163259# implementation of global symbol Excel sc/source/ui/vba/vbaglobals.cxx | 9 +++++++++ sc/source/ui/vba/vbaglobals.hxx | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) commit ff7c55aff1293fb51c8ab268d0f478480b0c5685 Merge: 80722e0 6e0de89 Author: Michael E. Bohn Date: Tue Aug 10 16:57:47 2010 +0200 heads merged commit 80722e0f75ad7d3204f39a580df2f48412e001c3 Author: Michael E. Bohn Date: Tue Aug 10 16:55:52 2010 +0200 mib18: #163120# adding the entrypoint for symbol Debug sc/source/ui/vba/vbaglobals.cxx | 19 +++++++++++++++++++ sc/source/ui/vba/vbaglobals.hxx | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) commit 6e0de8945fbfbee500e0fc9bfa26aaa67abeafa4 Author: Daniel Rentz Date: Tue Aug 10 11:52:54 2010 +0200 mib18: #163243# enable regular expressions in VBA symbol Range.Find sc/source/ui/vba/vbarange.cxx | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit d0093c4e1b54648d1e09c16b389519fdf2564f6e Author: Daniel Rentz Date: Tue Aug 10 10:27:30 2010 +0200 mib18: #163246# add VBA symbol Worksheet.ProtectScenarios sc/source/ui/vba/vbaworksheet.cxx | 10 ++++++++-- sc/source/ui/vba/vbaworksheet.hxx | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) commit b9876f93ddc6eaa0e5cf4aaf62cd19d3a08776c4 Author: Michael E. Bohn Date: Tue Aug 10 06:57:53 2010 +0200 mib18: #163148# creation og basic modules in library Standard during Workbooks.add sc/source/ui/vba/vbaworkbooks.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 80e4fe02a80b90182180c409d2f4f803562e02b8 Merge: 36f7091 81cec49 Author: Andreas Bregas Date: Fri Aug 6 09:39:35 2010 +0200 mib18: Merge commit 81cec496df67c85bb1b64ef7d15c9f73987882a0 Author: Daniel Rentz Date: Thu Aug 5 15:43:06 2010 +0200 mib18: #162503# do not create a new Worksheet object in Workbook.ActiveSheet but return existing object supporting VBA module access sc/source/ui/vba/vbaworkbook.cxx | 19 +++++++++++-------- sc/source/ui/vba/vbaworksheets.cxx | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) commit 36f709143ffc8056ece58e93e155a6dab9831cd9 Author: Daniel Rentz Date: Wed Aug 4 18:13:02 2010 +0200 mib18: #162938# add VBA symbol Worksheet.AutoFilterMode sc/source/ui/vba/vbaworksheet.cxx | 37 ++++++++++++++++++++++++++++++++++++- sc/source/ui/vba/vbaworksheet.hxx | 5 +++++ 2 files changed, 41 insertions(+), 1 deletions(-) commit c650f967f769e4da07f669f60e1f7a636d7e9614 Author: Daniel Rentz Date: Wed Aug 4 16:00:21 2010 +0200 mib18: #163200# full rework of VBA symbols Application.Intersect and Application.Union sc/source/ui/vba/makefile.mk | 92 +++--- sc/source/ui/vba/vbaapplication.cxx | 599 ++++++++++++++--------------------- 2 files changed, 281 insertions(+), 410 deletions(-) commit 5fa3d6e55b2ab5aac185c10293f8c6a1b7264e63 Author: Daniel Rentz Date: Wed Aug 4 09:59:00 2010 +0200 mib18: #163198# VBA Names collection must return VBA Name objects sc/source/ui/vba/vbanames.cxx | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 783c57ec2174b11b06ec29ecb1ae6b9b87996bf6 Author: Daniel Rentz Date: Wed Aug 4 09:58:00 2010 +0200 mib18: #163195# set correct parent for range returned by VBA ActiveCell symbol sc/source/ui/vba/vbaapplication.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 32876274fc8fae906bdb52e76059ddedadfa8572 Author: Daniel Rentz Date: Wed Aug 4 09:56:54 2010 +0200 mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters sc/source/ui/vba/vbarange.cxx | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) commit faa445a0730322e8522999ffb30fdde97bb9b9b9 Author: Daniel Rentz Date: Wed Aug 4 09:54:13 2010 +0200 mib18: #162039# clear covered cells when merging via VBA MergeCells symbol sc/source/ui/vba/vbarange.cxx | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) --- chart2/inc/pch/precompiled_chart2.cxx | 2 +- chart2/inc/pch/precompiled_chart2.hxx | 2 +- .../accessibility/AccStatisticsObject.cxx | 4 +- .../accessibility/AccStatisticsObject.hxx | 2 +- .../controller/accessibility/AccessibleBase.cxx | 2 +- .../accessibility/AccessibleChartElement.cxx | 2 +- .../accessibility/AccessibleChartElement.hxx | 2 +- .../accessibility/AccessibleChartShape.cxx | 2 +- .../accessibility/AccessibleChartShape.hxx | 2 +- .../accessibility/AccessibleChartView.cxx | 2 +- .../accessibility/AccessibleTextHelper.cxx | 2 +- .../accessibility/AccessibleViewForwarder.cxx | 2 +- .../accessibility/AccessibleViewForwarder.hxx | 4 +- .../accessibility/ChartElementFactory.cxx | 2 +- .../accessibility/ChartElementFactory.hxx | 2 +- .../controller/chartapiwrapper/AreaWrapper.cxx | 2 +- .../controller/chartapiwrapper/AreaWrapper.hxx | 2 +- .../controller/chartapiwrapper/AxisWrapper.cxx | 14 +- .../controller/chartapiwrapper/AxisWrapper.hxx | 4 +- .../chartapiwrapper/Chart2ModelContact.cxx | 4 +- .../chartapiwrapper/Chart2ModelContact.hxx | 2 +- .../chartapiwrapper/ChartDataWrapper.cxx | 8 +- .../chartapiwrapper/ChartDataWrapper.hxx | 4 +- .../chartapiwrapper/ChartDocumentWrapper.cxx | 4 +- .../chartapiwrapper/DataSeriesPointWrapper.cxx | 22 +- .../chartapiwrapper/DataSeriesPointWrapper.hxx | 6 +- .../controller/chartapiwrapper/DiagramWrapper.cxx | 24 +- .../controller/chartapiwrapper/DiagramWrapper.hxx | 6 +- .../controller/chartapiwrapper/GridWrapper.cxx | 2 +- .../controller/chartapiwrapper/GridWrapper.hxx | 2 +- .../controller/chartapiwrapper/LegendWrapper.cxx | 4 +- .../controller/chartapiwrapper/LegendWrapper.hxx | 2 +- .../chartapiwrapper/MinMaxLineWrapper.cxx | 6 +- .../chartapiwrapper/MinMaxLineWrapper.hxx | 10 +- .../ReferenceSizePropertyProvider.hxx | 2 +- .../controller/chartapiwrapper/TitleWrapper.cxx | 12 +- .../controller/chartapiwrapper/TitleWrapper.hxx | 2 +- .../chartapiwrapper/UpDownBarWrapper.cxx | 6 +- .../chartapiwrapper/UpDownBarWrapper.hxx | 12 +- .../chartapiwrapper/WallFloorWrapper.cxx | 2 +- .../chartapiwrapper/WallFloorWrapper.hxx | 2 +- .../chartapiwrapper/WrappedAddInProperty.cxx | 2 +- .../chartapiwrapper/WrappedAddInProperty.hxx | 2 +- .../WrappedAutomaticPositionProperties.cxx | 4 +- .../WrappedAutomaticPositionProperties.hxx | 2 +- .../WrappedAxisAndGridExistenceProperties.cxx | 8 +- .../WrappedAxisAndGridExistenceProperties.hxx | 2 +- .../WrappedCharacterHeightProperty.cxx | 2 +- .../WrappedCharacterHeightProperty.hxx | 2 +- .../WrappedDataCaptionProperties.cxx | 12 +- .../WrappedDataCaptionProperties.hxx | 2 +- .../chartapiwrapper/WrappedGapwidthProperty.cxx | 2 +- .../chartapiwrapper/WrappedGapwidthProperty.hxx | 2 +- .../WrappedNumberFormatProperty.cxx | 2 +- .../WrappedNumberFormatProperty.hxx | 2 +- .../chartapiwrapper/WrappedScaleProperty.cxx | 16 +- .../chartapiwrapper/WrappedScaleProperty.hxx | 4 +- .../chartapiwrapper/WrappedScaleTextProperties.cxx | 6 +- .../chartapiwrapper/WrappedScaleTextProperties.hxx | 2 +- .../chartapiwrapper/WrappedSceneProperty.cxx | 10 +- .../chartapiwrapper/WrappedSceneProperty.hxx | 4 +- .../WrappedSeriesAreaOrLineProperty.cxx | 2 +- .../WrappedSeriesAreaOrLineProperty.hxx | 2 +- .../WrappedSeriesOrDiagramProperty.hxx | 2 +- .../chartapiwrapper/WrappedSplineProperties.cxx | 6 +- .../chartapiwrapper/WrappedSplineProperties.hxx | 2 +- .../chartapiwrapper/WrappedStatisticProperties.cxx | 4 +- .../chartapiwrapper/WrappedStatisticProperties.hxx | 2 +- .../chartapiwrapper/WrappedStockProperties.cxx | 6 +- .../chartapiwrapper/WrappedStockProperties.hxx | 2 +- .../chartapiwrapper/WrappedSymbolProperties.cxx | 2 +- .../chartapiwrapper/WrappedSymbolProperties.hxx | 2 +- .../WrappedTextRotationProperty.cxx | 2 +- .../WrappedTextRotationProperty.hxx | 2 +- chart2/source/controller/dialogs/Bitmaps.hrc | 2 +- chart2/source/controller/dialogs/Bitmaps.src | 2 +- chart2/source/controller/dialogs/Bitmaps_HC.hrc | 2 +- chart2/source/controller/dialogs/Bitmaps_HC.src | 2 +- .../source/controller/dialogs/ChangingResource.cxx | 2 +- .../source/controller/dialogs/ChangingResource.hxx | 4 +- .../dialogs/ChartTypeDialogController.cxx | 34 +- .../dialogs/ChartTypeDialogController.hxx | 46 +- .../dialogs/ChartTypeTemplateProvider.hxx | 2 +- .../source/controller/dialogs/CommonResources.hrc | 2 +- chart2/source/controller/dialogs/DataBrowser.cxx | 4 +- chart2/source/controller/dialogs/DataBrowser.hxx | 12 +- .../source/controller/dialogs/DataBrowserModel.cxx | 4 +- .../source/controller/dialogs/DataBrowserModel.hxx | 2 +- chart2/source/controller/dialogs/DialogModel.cxx | 2 +- chart2/source/controller/dialogs/DialogModel.hxx | 2 +- .../controller/dialogs/ObjectNameProvider.cxx | 16 +- chart2/source/controller/dialogs/RangeEdit.cxx | 2 +- .../controller/dialogs/RangeSelectionButton.cxx | 2 +- .../controller/dialogs/RangeSelectionHelper.cxx | 2 +- .../controller/dialogs/RangeSelectionListener.cxx | 2 +- chart2/source/controller/dialogs/ResourceIds.hrc | 6 +- chart2/source/controller/dialogs/Strings.src | 4 +- .../dialogs/Strings_AdditionalControls.src | 2 +- .../controller/dialogs/Strings_ChartTypes.src | 2 +- chart2/source/controller/dialogs/Strings_Scale.src | 2 +- .../controller/dialogs/Strings_Statistic.src | 2 +- chart2/source/controller/dialogs/TabPages.hrc | 106 +- .../controller/dialogs/TextDirectionListBox.cxx | 2 +- .../dialogs/TimerTriggeredControllerLock.cxx | 2 +- .../source/controller/dialogs/TitleDialogData.cxx | 2 +- chart2/source/controller/dialogs/dlg_ChartType.cxx | 4 +- chart2/source/controller/dialogs/dlg_ChartType.hrc | 2 +- chart2/source/controller/dialogs/dlg_ChartType.src | 8 +- .../controller/dialogs/dlg_ChartType_UNO.cxx | 4 +- .../controller/dialogs/dlg_CreationWizard.cxx | 2 +- .../controller/dialogs/dlg_CreationWizard.hrc | 2 +- .../controller/dialogs/dlg_CreationWizard.src | 2 +- .../controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +- .../source/controller/dialogs/dlg_DataEditor.cxx | 2 +- .../source/controller/dialogs/dlg_DataEditor.hrc | 2 +- .../source/controller/dialogs/dlg_DataEditor.src | 2 +- .../source/controller/dialogs/dlg_DataSource.cxx | 2 +- .../source/controller/dialogs/dlg_DataSource.hrc | 2 +- .../source/controller/dialogs/dlg_DataSource.src | 2 +- .../controller/dialogs/dlg_InsertAxis_Grid.cxx | 4 +- .../controller/dialogs/dlg_InsertAxis_Grid.hrc | 2 +- .../controller/dialogs/dlg_InsertAxis_Grid.src | 8 +- .../controller/dialogs/dlg_InsertDataLabel.cxx | 2 +- .../controller/dialogs/dlg_InsertDataLabel.hrc | 2 +- .../controller/dialogs/dlg_InsertDataLabel.src | 2 +- .../controller/dialogs/dlg_InsertErrorBars.cxx | 2 +- .../controller/dialogs/dlg_InsertErrorBars.hrc | 2 +- .../controller/dialogs/dlg_InsertErrorBars.src | 4 +- .../source/controller/dialogs/dlg_InsertLegend.cxx | 2 +- .../source/controller/dialogs/dlg_InsertLegend.hrc | 2 +- .../source/controller/dialogs/dlg_InsertLegend.src | 2 +- .../source/controller/dialogs/dlg_InsertTitle.cxx | 2 +- .../source/controller/dialogs/dlg_InsertTitle.hrc | 4 +- .../source/controller/dialogs/dlg_InsertTitle.src | 2 +- .../controller/dialogs/dlg_InsertTrendline.cxx | 2 +- .../controller/dialogs/dlg_InsertTrendline.hrc | 2 +- .../controller/dialogs/dlg_InsertTrendline.src | 2 +- .../source/controller/dialogs/dlg_NumberFormat.cxx | 4 +- .../source/controller/dialogs/dlg_NumberFormat.hxx | 2 +- .../controller/dialogs/dlg_ObjectProperties.cxx | 4 +- .../controller/dialogs/dlg_ObjectProperties.src | 2 +- chart2/source/controller/dialogs/dlg_ShapeFont.cxx | 2 +- chart2/source/controller/dialogs/dlg_ShapeFont.src | 2 +- .../controller/dialogs/dlg_ShapeParagraph.cxx | 2 +- .../controller/dialogs/dlg_ShapeParagraph.src | 2 +- chart2/source/controller/dialogs/dlg_View3D.cxx | 2 +- chart2/source/controller/dialogs/dlg_View3D.hrc | 2 +- chart2/source/controller/dialogs/dlg_View3D.src | 4 +- chart2/source/controller/dialogs/hidother.src | 2 +- .../source/controller/dialogs/res_BarGeometry.cxx | 6 +- .../source/controller/dialogs/res_BarGeometry.hxx | 2 +- .../source/controller/dialogs/res_BarGeometry.src | 2 +- chart2/source/controller/dialogs/res_DataLabel.cxx | 6 +- chart2/source/controller/dialogs/res_DataLabel.hxx | 2 +- .../controller/dialogs/res_DataLabel_IDs.hrc | 2 +- .../controller/dialogs/res_DataLabel_tmpl.hrc | 6 +- chart2/source/controller/dialogs/res_ErrorBar.cxx | 2 +- .../source/controller/dialogs/res_ErrorBar_IDs.hrc | 2 +- .../controller/dialogs/res_ErrorBar_tmpl.hrc | 4 +- .../controller/dialogs/res_LegendPosition.cxx | 6 +- .../controller/dialogs/res_LegendPosition.hxx | 10 +- .../controller/dialogs/res_LegendPosition_IDs.hrc | 2 +- .../controller/dialogs/res_LegendPosition_tmpl.hrc | 2 +- .../dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc | 2 +- .../controller/dialogs/res_TextSeparator.cxx | 2 +- .../controller/dialogs/res_TextSeparator.hxx | 2 +- .../controller/dialogs/res_TextSeparator.src | 4 +- chart2/source/controller/dialogs/res_Titles.cxx | 12 +- chart2/source/controller/dialogs/res_Titles.hrc | 2 +- chart2/source/controller/dialogs/res_Titles.hxx | 22 +- .../source/controller/dialogs/res_Titlesx_tmpl.hrc | 2 +- chart2/source/controller/dialogs/res_Trendline.cxx | 2 +- chart2/source/controller/dialogs/res_Trendline.hxx | 2 +- .../controller/dialogs/res_Trendline_IDs.hrc | 2 +- .../controller/dialogs/res_Trendline_tmpl.hrc | 2 +- .../controller/dialogs/tp_3D_SceneAppearance.cxx | 10 +- .../controller/dialogs/tp_3D_SceneAppearance.hrc | 2 +- .../controller/dialogs/tp_3D_SceneAppearance.hxx | 14 +- .../controller/dialogs/tp_3D_SceneAppearance.src | 8 +- .../controller/dialogs/tp_3D_SceneGeometry.cxx | 22 +- .../controller/dialogs/tp_3D_SceneGeometry.hrc | 2 +- .../controller/dialogs/tp_3D_SceneGeometry.hxx | 24 +- .../controller/dialogs/tp_3D_SceneGeometry.src | 8 +- .../controller/dialogs/tp_3D_SceneIllumination.cxx | 26 +- .../controller/dialogs/tp_3D_SceneIllumination.hrc | 2 +- .../controller/dialogs/tp_3D_SceneIllumination.hxx | 4 +- .../controller/dialogs/tp_3D_SceneIllumination.src | 10 +- chart2/source/controller/dialogs/tp_AxisLabel.cxx | 4 +- chart2/source/controller/dialogs/tp_AxisLabel.hxx | 16 +- chart2/source/controller/dialogs/tp_AxisLabel.src | 28 +- .../source/controller/dialogs/tp_AxisPositions.cxx | 18 +- .../source/controller/dialogs/tp_AxisPositions.hxx | 8 +- .../source/controller/dialogs/tp_AxisPositions.src | 28 +- chart2/source/controller/dialogs/tp_ChartType.cxx | 10 +- chart2/source/controller/dialogs/tp_ChartType.hrc | 8 +- chart2/source/controller/dialogs/tp_ChartType.hxx | 8 +- chart2/source/controller/dialogs/tp_ChartType.src | 6 +- chart2/source/controller/dialogs/tp_DataLabel.cxx | 2 +- chart2/source/controller/dialogs/tp_DataLabel.hxx | 2 +- chart2/source/controller/dialogs/tp_DataLabel.src | 2 +- chart2/source/controller/dialogs/tp_DataSource.cxx | 6 +- chart2/source/controller/dialogs/tp_DataSource.hrc | 2 +- chart2/source/controller/dialogs/tp_DataSource.hxx | 4 +- chart2/source/controller/dialogs/tp_DataSource.src | 2 +- .../controller/dialogs/tp_DataSourceControls.cxx | 2 +- .../controller/dialogs/tp_DataSourceControls.hxx | 2 +- chart2/source/controller/dialogs/tp_ErrorBars.cxx | 2 +- chart2/source/controller/dialogs/tp_ErrorBars.hxx | 2 +- chart2/source/controller/dialogs/tp_ErrorBars.src | 4 +- .../controller/dialogs/tp_LegendPosition.cxx | 2 +- .../controller/dialogs/tp_LegendPosition.hxx | 4 +- .../controller/dialogs/tp_LegendPosition.src | 2 +- chart2/source/controller/dialogs/tp_Location.cxx | 2 +- chart2/source/controller/dialogs/tp_Location.hrc | 2 +- chart2/source/controller/dialogs/tp_Location.hxx | 2 +- chart2/source/controller/dialogs/tp_Location.src | 2 +- .../source/controller/dialogs/tp_PointGeometry.cxx | 2 +- .../source/controller/dialogs/tp_PointGeometry.hxx | 2 +- .../source/controller/dialogs/tp_PointGeometry.src | 2 +- .../source/controller/dialogs/tp_PolarOptions.cxx | 2 +- .../source/controller/dialogs/tp_PolarOptions.hrc | 2 +- .../source/controller/dialogs/tp_PolarOptions.hxx | 4 +- .../source/controller/dialogs/tp_PolarOptions.src | 4 +- .../source/controller/dialogs/tp_RangeChooser.cxx | 2 +- .../source/controller/dialogs/tp_RangeChooser.hrc | 2 +- .../source/controller/dialogs/tp_RangeChooser.hxx | 2 +- .../source/controller/dialogs/tp_RangeChooser.src | 2 +- chart2/source/controller/dialogs/tp_Scale.cxx | 32 +- chart2/source/controller/dialogs/tp_Scale.hxx | 48 +- chart2/source/controller/dialogs/tp_Scale.src | 12 +- .../source/controller/dialogs/tp_SeriesToAxis.cxx | 18 +- .../source/controller/dialogs/tp_SeriesToAxis.hrc | 20 +- .../source/controller/dialogs/tp_SeriesToAxis.hxx | 8 +- .../source/controller/dialogs/tp_SeriesToAxis.src | 18 +- .../source/controller/dialogs/tp_TitleRotation.cxx | 2 +- .../source/controller/dialogs/tp_TitleRotation.hxx | 2 +- .../source/controller/dialogs/tp_TitleRotation.src | 2 +- chart2/source/controller/dialogs/tp_Trendline.cxx | 2 +- chart2/source/controller/dialogs/tp_Trendline.hxx | 2 +- chart2/source/controller/dialogs/tp_Trendline.src | 4 +- .../dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +- .../dialogs/tp_Wizard_TitlesAndObjects.hrc | 2 +- .../dialogs/tp_Wizard_TitlesAndObjects.hxx | 8 +- .../dialogs/tp_Wizard_TitlesAndObjects.src | 2 +- .../controller/drawinglayer/DrawViewWrapper.cxx | 10 +- .../drawinglayer/ViewElementListProvider.cxx | 6 +- chart2/source/controller/inc/AccessibleBase.hxx | 2 +- .../source/controller/inc/AccessibleChartView.hxx | 2 +- .../source/controller/inc/AccessibleTextHelper.hxx | 2 +- chart2/source/controller/inc/AxisItemConverter.hxx | 4 +- .../inc/CharacterPropertyItemConverter.hxx | 2 +- .../source/controller/inc/ChartDocumentWrapper.hxx | 6 +- chart2/source/controller/inc/ChartRenderer.hxx | 4 +- .../source/controller/inc/ConfigurationAccess.hxx | 2 +- .../controller/inc/DataPointItemConverter.hxx | 2 +- chart2/source/controller/inc/DrawViewWrapper.hxx | 2 +- .../controller/inc/ErrorBarItemConverter.hxx | 2 +- .../inc/GraphicPropertyItemConverter.hxx | 2 +- chart2/source/controller/inc/HelpIds.hrc | 12 +- chart2/source/controller/inc/ItemConverter.hxx | 2 +- chart2/source/controller/inc/ItemPropertyMap.hxx | 2 +- .../source/controller/inc/LegendItemConverter.hxx | 2 +- chart2/source/controller/inc/MenuResIds.hrc | 2 +- .../controller/inc/MultipleChartConverters.hxx | 2 +- .../controller/inc/MultipleItemConverter.hxx | 2 +- chart2/source/controller/inc/ObjectHierarchy.hxx | 4 +- .../source/controller/inc/ObjectNameProvider.hxx | 4 +- .../controller/inc/PositionAndSizeHelper.hxx | 2 +- chart2/source/controller/inc/RangeEdit.hxx | 2 +- .../source/controller/inc/RangeSelectionButton.hxx | 2 +- .../source/controller/inc/RangeSelectionHelper.hxx | 2 +- .../controller/inc/RangeSelectionListener.hxx | 2 +- .../inc/RegressionCurveItemConverter.hxx | 2 +- .../inc/RegressionEquationItemConverter.hxx | 2 +- chart2/source/controller/inc/SchSlotIds.hxx | 78 +- .../controller/inc/SeriesOptionsItemConverter.hxx | 4 +- chart2/source/controller/inc/ShapeController.hrc | 2 +- .../controller/inc/StatisticsItemConverter.hxx | 2 +- chart2/source/controller/inc/TabPageNotifiable.hxx | 2 +- .../source/controller/inc/TextDirectionListBox.hxx | 2 +- .../inc/TimerTriggeredControllerLock.hxx | 2 +- chart2/source/controller/inc/TitleDialogData.hxx | 2 +- .../source/controller/inc/TitleItemConverter.hxx | 2 +- .../controller/inc/ViewElementListProvider.hxx | 2 +- chart2/source/controller/inc/dlg_ChartType.hxx | 10 +- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 6 +- .../source/controller/inc/dlg_CreationWizard.hxx | 12 +- .../controller/inc/dlg_CreationWizard_UNO.hxx | 8 +- chart2/source/controller/inc/dlg_DataEditor.hxx | 4 +- chart2/source/controller/inc/dlg_DataSource.hxx | 8 +- .../source/controller/inc/dlg_InsertAxis_Grid.hxx | 28 +- .../source/controller/inc/dlg_InsertDataLabel.hxx | 10 +- .../source/controller/inc/dlg_InsertErrorBars.hxx | 2 +- chart2/source/controller/inc/dlg_InsertLegend.hxx | 8 +- chart2/source/controller/inc/dlg_InsertTitle.hxx | 10 +- .../source/controller/inc/dlg_InsertTrendline.hxx | 2 +- .../source/controller/inc/dlg_ObjectProperties.hxx | 22 +- chart2/source/controller/inc/dlg_ShapeFont.hxx | 2 +- .../source/controller/inc/dlg_ShapeParagraph.hxx | 2 +- chart2/source/controller/inc/dlg_View3D.hxx | 8 +- chart2/source/controller/inc/res_ErrorBar.hxx | 2 +- .../itemsetwrapper/AxisItemConverter.cxx | 22 +- .../CharacterPropertyItemConverter.cxx | 4 +- .../itemsetwrapper/DataPointItemConverter.cxx | 16 +- .../itemsetwrapper/ErrorBarItemConverter.cxx | 2 +- .../GraphicPropertyItemConverter.cxx | 4 +- .../controller/itemsetwrapper/ItemConverter.cxx | 2 +- .../itemsetwrapper/LegendItemConverter.cxx | 2 +- .../itemsetwrapper/MultipleChartConverters.cxx | 4 +- .../itemsetwrapper/MultipleItemConverter.cxx | 2 +- .../RegressionCurveItemConverter.cxx | 2 +- .../RegressionEquationItemConverter.cxx | 2 +- .../controller/itemsetwrapper/SchWhichPairs.hxx | 102 +- .../itemsetwrapper/SeriesOptionsItemConverter.cxx | 6 +- .../itemsetwrapper/StatisticsItemConverter.cxx | 2 +- .../itemsetwrapper/TitleItemConverter.cxx | 2 +- chart2/source/controller/main/ChartController.cxx | 54 +- chart2/source/controller/main/ChartController.hxx | 78 +- .../controller/main/ChartController_EditData.cxx | 2 +- .../controller/main/ChartController_Insert.cxx | 8 +- .../controller/main/ChartController_Position.cxx | 12 +- .../controller/main/ChartController_Properties.cxx | 16 +- .../controller/main/ChartController_TextEdit.cxx | 4 +- .../controller/main/ChartController_Tools.cxx | 20 +- .../controller/main/ChartController_Window.cxx | 46 +- .../controller/main/ChartDropTargetHelper.cxx | 2 +- .../controller/main/ChartDropTargetHelper.hxx | 4 +- chart2/source/controller/main/ChartFrameloader.cxx | 8 +- chart2/source/controller/main/ChartFrameloader.hxx | 16 +- chart2/source/controller/main/ChartRenderer.cxx | 8 +- .../source/controller/main/ChartTransferable.cxx | 2 +- .../source/controller/main/ChartTransferable.hxx | 2 +- chart2/source/controller/main/ChartWindow.cxx | 2 +- chart2/source/controller/main/ChartWindow.hxx | 2 +- chart2/source/controller/main/CommandDispatch.cxx | 2 +- chart2/source/controller/main/CommandDispatch.hxx | 2 +- .../controller/main/CommandDispatchContainer.cxx | 6 +- .../controller/main/CommandDispatchContainer.hxx | 2 +- .../source/controller/main/ConfigurationAccess.cxx | 2 +- .../controller/main/ControllerCommandDispatch.cxx | 2 +- .../controller/main/ControllerCommandDispatch.hxx | 2 +- chart2/source/controller/main/DragMethod_Base.cxx | 2 +- chart2/source/controller/main/DragMethod_Base.hxx | 2 +- .../controller/main/DragMethod_PieSegment.cxx | 4 +- .../controller/main/DragMethod_PieSegment.hxx | 2 +- .../controller/main/DragMethod_RotateDiagram.cxx | 12 +- .../controller/main/DragMethod_RotateDiagram.hxx | 8 +- .../source/controller/main/DrawCommandDispatch.cxx | 4 +- .../source/controller/main/DrawCommandDispatch.hrc | 2 +- .../source/controller/main/DrawCommandDispatch.hxx | 2 +- chart2/source/controller/main/ElementSelector.cxx | 6 +- chart2/source/controller/main/ElementSelector.hxx | 8 +- .../controller/main/FeatureCommandDispatchBase.cxx | 2 +- .../controller/main/FeatureCommandDispatchBase.hxx | 4 +- chart2/source/controller/main/ImplUndoManager.cxx | 2 +- chart2/source/controller/main/ImplUndoManager.hxx | 2 +- chart2/source/controller/main/ObjectHierarchy.cxx | 6 +- .../controller/main/PositionAndSizeHelper.cxx | 2 +- chart2/source/controller/main/SelectionHelper.cxx | 16 +- chart2/source/controller/main/SelectionHelper.hxx | 2 +- chart2/source/controller/main/ShapeController.cxx | 2 +- chart2/source/controller/main/ShapeController.hxx | 2 +- .../controller/main/ShapeToolbarController.cxx | 10 +- .../controller/main/ShapeToolbarController.hxx | 4 +- .../controller/main/StatusBarCommandDispatch.cxx | 2 +- .../controller/main/StatusBarCommandDispatch.hxx | 2 +- .../source/controller/main/UndoCommandDispatch.cxx | 2 +- .../source/controller/main/UndoCommandDispatch.hxx | 2 +- chart2/source/controller/main/UndoGuard.cxx | 2 +- chart2/source/controller/main/UndoManager.cxx | 2 +- .../main/_serviceregistration_controller.cxx | 2 +- .../source/controller/menus/ShapeContextMenu.src | 6 +- .../controller/menus/ShapeEditContextMenu.src | 2 +- chart2/source/inc/AxisHelper.hxx | 8 +- chart2/source/inc/AxisIndexDefines.hxx | 2 +- chart2/source/inc/BaseGFXHelper.hxx | 2 +- chart2/source/inc/CachedDataSequence.hxx | 4 +- chart2/source/inc/CharacterProperties.hxx | 2 +- chart2/source/inc/ChartDebugTrace.hxx | 2 +- chart2/source/inc/ChartModelHelper.hxx | 2 +- chart2/source/inc/ChartTypeHelper.hxx | 2 +- chart2/source/inc/ChartViewHelper.hxx | 2 +- chart2/source/inc/CloneHelper.hxx | 2 +- chart2/source/inc/ColorPerPointHelper.hxx | 2 +- chart2/source/inc/CommonConverters.hxx | 4 +- chart2/source/inc/CommonFunctors.hxx | 2 +- chart2/source/inc/ConfigColorScheme.hxx | 2 +- chart2/source/inc/ConfigItemListener.hxx | 2 +- chart2/source/inc/ContainerHelper.hxx | 2 +- chart2/source/inc/ControllerLockGuard.hxx | 2 +- chart2/source/inc/DataSeriesHelper.hxx | 2 +- chart2/source/inc/DataSource.hxx | 2 +- chart2/source/inc/DataSourceHelper.hxx | 4 +- chart2/source/inc/DiagramHelper.hxx | 6 +- chart2/source/inc/DisposeHelper.hxx | 2 +- chart2/source/inc/ErrorBar.hxx | 2 +- chart2/source/inc/EventListenerHelper.hxx | 2 +- chart2/source/inc/ExplicitCategoriesProvider.hxx | 2 +- .../inc/ExponentialRegressionCurveCalculator.hxx | 2 +- chart2/source/inc/FastPropertyIdRanges.hxx | 2 +- chart2/source/inc/FillProperties.hxx | 2 +- chart2/source/inc/FormattedStringHelper.hxx | 2 +- chart2/source/inc/InternalData.hxx | 4 +- chart2/source/inc/InternalDataProvider.hxx | 8 +- chart2/source/inc/LabeledDataSequence.hxx | 2 +- chart2/source/inc/LegendHelper.hxx | 2 +- chart2/source/inc/LifeTime.hxx | 86 +- chart2/source/inc/LineProperties.hxx | 2 +- .../source/inc/LinearRegressionCurveCalculator.hxx | 2 +- .../inc/LogarithmicRegressionCurveCalculator.hxx | 2 +- .../inc/MeanValueRegressionCurveCalculator.hxx | 2 +- chart2/source/inc/MediaDescriptorHelper.hxx | 134 +- chart2/source/inc/ModifyListenerCallBack.hxx | 4 +- chart2/source/inc/ModifyListenerHelper.hxx | 2 +- chart2/source/inc/MutexContainer.hxx | 2 +- chart2/source/inc/NameContainer.hxx | 2 +- chart2/source/inc/NamedFillProperties.hxx | 2 +- chart2/source/inc/NamedLineProperties.hxx | 2 +- chart2/source/inc/NamedProperties.hxx | 2 +- chart2/source/inc/NoWarningThisInCTOR.hxx | 2 +- chart2/source/inc/OPropertySet.hxx | 2 +- chart2/source/inc/ObjectIdentifier.hxx | 6 +- .../inc/PotentialRegressionCurveCalculator.hxx | 2 +- chart2/source/inc/PropertyHelper.hxx | 2 +- chart2/source/inc/RangeHighlighter.hxx | 2 +- chart2/source/inc/ReferenceSizeProvider.hxx | 2 +- chart2/source/inc/RegressionCurveCalculator.hxx | 2 +- chart2/source/inc/RegressionCurveHelper.hxx | 4 +- chart2/source/inc/RelativePositionHelper.hxx | 2 +- chart2/source/inc/RelativeSizeHelper.hxx | 2 +- chart2/source/inc/ResId.hxx | 2 +- chart2/source/inc/RessourceManager.hxx | 2 +- chart2/source/inc/Scaling.hxx | 2 +- chart2/source/inc/SceneProperties.hxx | 2 +- chart2/source/inc/ServiceMacros.hxx | 32 +- chart2/source/inc/StackMode.hxx | 2 +- chart2/source/inc/StatisticsHelper.hxx | 2 +- chart2/source/inc/Strings.hrc | 176 +- chart2/source/inc/ThreeDHelper.hxx | 8 +- chart2/source/inc/TitleHelper.hxx | 2 +- chart2/source/inc/TrueGuard.hxx | 4 +- chart2/source/inc/UncachedDataSequence.hxx | 2 +- chart2/source/inc/UndoGuard.hxx | 2 +- chart2/source/inc/UndoManager.hxx | 2 +- chart2/source/inc/UserDefinedProperties.hxx | 2 +- chart2/source/inc/WeakListenerAdapter.hxx | 2 +- chart2/source/inc/WrappedDefaultProperty.hxx | 2 +- chart2/source/inc/WrappedDirectStateProperty.hxx | 2 +- chart2/source/inc/WrappedIgnoreProperty.hxx | 2 +- chart2/source/inc/WrappedProperty.hxx | 2 +- chart2/source/inc/WrappedPropertySet.hxx | 10 +- chart2/source/inc/XMLRangeHelper.hxx | 2 +- chart2/source/inc/charttoolsdllapi.hxx | 2 +- chart2/source/inc/chartview/ChartSfxItemIds.hxx | 190 +- .../inc/chartview/DataPointSymbolSupplier.hxx | 2 +- chart2/source/inc/chartview/DrawModelWrapper.hxx | 4 +- .../source/inc/chartview/ExplicitValueProvider.hxx | 4 +- .../inc/chartview/NumberFormatterWrapper.hxx | 2 +- chart2/source/inc/chartview/chartviewdllapi.hxx | 2 +- .../inc/chartview/servicenames_charttypes.hxx | 2 +- chart2/source/inc/macros.hxx | 2 +- chart2/source/inc/servicenames.hxx | 2 +- chart2/source/inc/servicenames_charttypes.hxx | 2 +- chart2/source/inc/servicenames_coosystems.hxx | 2 +- chart2/source/inc/servicenames_dlwrapper.hxx | 2 +- chart2/source/model/filter/XMLFilter.cxx | 8 +- chart2/source/model/inc/BaseCoordinateSystem.hxx | 2 +- .../source/model/inc/CartesianCoordinateSystem.hxx | 2 +- chart2/source/model/inc/ChartTypeManager.hxx | 2 +- chart2/source/model/inc/DataSeries.hxx | 2 +- chart2/source/model/inc/DataSeriesTree.hxx | 2 +- chart2/source/model/inc/Diagram.hxx | 12 +- chart2/source/model/inc/PolarCoordinateSystem.hxx | 2 +- chart2/source/model/inc/StockBar.hxx | 2 +- chart2/source/model/inc/XMLFilter.hxx | 18 +- .../model/inc/_serviceregistration_charttypes.hxx | 2 +- chart2/source/model/main/Axis.cxx | 4 +- chart2/source/model/main/Axis.hxx | 6 +- chart2/source/model/main/BaseCoordinateSystem.cxx | 2 +- .../model/main/CartesianCoordinateSystem.cxx | 2 +- chart2/source/model/main/ChartModel.cxx | 19 +- chart2/source/model/main/ChartModel.hxx | 58 +- .../source/model/main/ChartModel_Persistence.cxx | 32 +- chart2/source/model/main/DataPoint.cxx | 2 +- chart2/source/model/main/DataPoint.hxx | 2 +- chart2/source/model/main/DataPointProperties.cxx | 2 +- chart2/source/model/main/DataPointProperties.hxx | 2 +- chart2/source/model/main/DataSeries.cxx | 4 +- chart2/source/model/main/DataSeriesProperties.cxx | 2 +- chart2/source/model/main/DataSeriesProperties.hxx | 2 +- chart2/source/model/main/Diagram.cxx | 2 +- chart2/source/model/main/FormattedString.cxx | 4 +- chart2/source/model/main/FormattedString.hxx | 6 +- chart2/source/model/main/GridProperties.cxx | 2 +- chart2/source/model/main/GridProperties.hxx | 2 +- chart2/source/model/main/LayoutContainer.cxx | 2 +- chart2/source/model/main/LayoutContainer.hxx | 2 +- chart2/source/model/main/Legend.cxx | 2 +- chart2/source/model/main/Legend.hxx | 6 +- chart2/source/model/main/PageBackground.cxx | 2 +- chart2/source/model/main/PageBackground.hxx | 6 +- chart2/source/model/main/PolarCoordinateSystem.cxx | 2 +- chart2/source/model/main/StockBar.cxx | 2 +- chart2/source/model/main/Title.cxx | 2 +- chart2/source/model/main/Title.hxx | 6 +- chart2/source/model/main/Wall.cxx | 2 +- chart2/source/model/main/Wall.hxx | 6 +- .../model/main/_serviceregistration_model.cxx | 2 +- chart2/source/model/template/AreaChartType.cxx | 2 +- chart2/source/model/template/AreaChartType.hxx | 2 +- .../model/template/AreaChartTypeTemplate.cxx | 4 +- .../model/template/AreaChartTypeTemplate.hxx | 2 +- chart2/source/model/template/BarChartType.cxx | 2 +- chart2/source/model/template/BarChartType.hxx | 2 +- .../source/model/template/BarChartTypeTemplate.cxx | 6 +- .../source/model/template/BarChartTypeTemplate.hxx | 2 +- chart2/source/model/template/BubbleChartType.cxx | 6 +- chart2/source/model/template/BubbleChartType.hxx | 2 +- .../model/template/BubbleChartTypeTemplate.cxx | 2 +- .../model/template/BubbleChartTypeTemplate.hxx | 2 +- .../model/template/BubbleDataInterpreter.cxx | 6 +- .../model/template/BubbleDataInterpreter.hxx | 2 +- .../source/model/template/CandleStickChartType.cxx | 2 +- .../source/model/template/CandleStickChartType.hxx | 2 +- chart2/source/model/template/ChartType.cxx | 4 +- chart2/source/model/template/ChartType.hxx | 8 +- chart2/source/model/template/ChartTypeManager.cxx | 2 +- chart2/source/model/template/ChartTypeTemplate.cxx | 4 +- chart2/source/model/template/ChartTypeTemplate.hxx | 4 +- chart2/source/model/template/ColumnChartType.cxx | 2 +- chart2/source/model/template/ColumnChartType.hxx | 2 +- .../model/template/ColumnLineChartTypeTemplate.cxx | 4 +- .../model/template/ColumnLineChartTypeTemplate.hxx | 2 +- .../model/template/ColumnLineDataInterpreter.cxx | 2 +- .../model/template/ColumnLineDataInterpreter.hxx | 2 +- chart2/source/model/template/DataInterpreter.cxx | 2 +- chart2/source/model/template/DataInterpreter.hxx | 2 +- .../source/model/template/FilledNetChartType.cxx | 2 +- .../source/model/template/FilledNetChartType.hxx | 2 +- chart2/source/model/template/LineChartType.cxx | 2 +- chart2/source/model/template/LineChartType.hxx | 2 +- .../model/template/LineChartTypeTemplate.cxx | 2 +- .../model/template/LineChartTypeTemplate.hxx | 2 +- chart2/source/model/template/NetChartType.cxx | 4 +- chart2/source/model/template/NetChartType.hxx | 2 +- .../source/model/template/NetChartTypeTemplate.cxx | 6 +- .../source/model/template/NetChartTypeTemplate.hxx | 2 +- chart2/source/model/template/PieChartType.cxx | 2 +- chart2/source/model/template/PieChartType.hxx | 2 +- .../source/model/template/PieChartTypeTemplate.cxx | 4 +- .../source/model/template/PieChartTypeTemplate.hxx | 2 +- chart2/source/model/template/ScatterChartType.cxx | 4 +- chart2/source/model/template/ScatterChartType.hxx | 2 +- .../model/template/ScatterChartTypeTemplate.cxx | 2 +- .../model/template/ScatterChartTypeTemplate.hxx | 2 +- .../model/template/StockChartTypeTemplate.cxx | 8 +- .../model/template/StockChartTypeTemplate.hxx | 2 +- .../source/model/template/StockDataInterpreter.cxx | 2 +- .../source/model/template/StockDataInterpreter.hxx | 2 +- chart2/source/model/template/XYDataInterpreter.cxx | 6 +- chart2/source/model/template/XYDataInterpreter.hxx | 2 +- .../template/_serviceregistration_charttypes.cxx | 2 +- chart2/source/tools/AxisHelper.cxx | 2 +- chart2/source/tools/BaseGFXHelper.cxx | 4 +- chart2/source/tools/CachedDataSequence.cxx | 2 +- chart2/source/tools/CharacterProperties.cxx | 2 +- chart2/source/tools/ChartDebugTrace.cxx | 4 +- chart2/source/tools/ChartModelHelper.cxx | 4 +- chart2/source/tools/ChartTypeHelper.cxx | 6 +- chart2/source/tools/ChartViewHelper.cxx | 2 +- chart2/source/tools/ColorPerPointHelper.cxx | 2 +- chart2/source/tools/CommonConverters.cxx | 10 +- chart2/source/tools/ConfigColorScheme.cxx | 2 +- chart2/source/tools/ControllerLockGuard.cxx | 2 +- chart2/source/tools/DataSeriesHelper.cxx | 2 +- chart2/source/tools/DataSource.cxx | 2 +- chart2/source/tools/DataSourceHelper.cxx | 4 +- chart2/source/tools/DiagramHelper.cxx | 22 +- chart2/source/tools/ErrorBar.cxx | 2 +- chart2/source/tools/ExplicitCategoriesProvider.cxx | 14 +- .../tools/ExponentialRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/FillProperties.cxx | 2 +- chart2/source/tools/FormattedStringHelper.cxx | 4 +- chart2/source/tools/ImplOPropertySet.cxx | 2 +- chart2/source/tools/ImplOPropertySet.hxx | 2 +- chart2/source/tools/InternalData.cxx | 12 +- chart2/source/tools/InternalDataProvider.cxx | 6 +- chart2/source/tools/LabeledDataSequence.cxx | 2 +- chart2/source/tools/LegendHelper.cxx | 4 +- chart2/source/tools/LifeTime.cxx | 10 +- chart2/source/tools/LineProperties.cxx | 4 +- .../tools/LinearRegressionCurveCalculator.cxx | 2 +- .../tools/LogarithmicRegressionCurveCalculator.cxx | 2 +- .../tools/MeanValueRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/MediaDescriptorHelper.cxx | 54 +- chart2/source/tools/ModifyListenerCallBack.cxx | 2 +- chart2/source/tools/ModifyListenerHelper.cxx | 2 +- chart2/source/tools/MutexContainer.cxx | 2 +- chart2/source/tools/NameContainer.cxx | 6 +- chart2/source/tools/NamedFillProperties.cxx | 2 +- chart2/source/tools/NamedLineProperties.cxx | 2 +- chart2/source/tools/NamedProperties.cxx | 2 +- chart2/source/tools/OPropertySet.cxx | 2 +- chart2/source/tools/ObjectIdentifier.cxx | 28 +- .../tools/PotentialRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/PropertyHelper.cxx | 2 +- chart2/source/tools/RangeHighlighter.cxx | 2 +- chart2/source/tools/ReferenceSizeProvider.cxx | 4 +- .../source/tools/RegressionCalculationHelper.hxx | 2 +- chart2/source/tools/RegressionCurveCalculator.cxx | 2 +- chart2/source/tools/RegressionCurveHelper.cxx | 6 +- chart2/source/tools/RegressionCurveModel.cxx | 2 +- chart2/source/tools/RegressionCurveModel.hxx | 2 +- chart2/source/tools/RegressionEquation.cxx | 2 +- chart2/source/tools/RegressionEquation.hxx | 2 +- chart2/source/tools/RelativePositionHelper.cxx | 2 +- chart2/source/tools/RelativeSizeHelper.cxx | 2 +- chart2/source/tools/ResId.cxx | 2 +- chart2/source/tools/RessourceManager.cxx | 2 +- chart2/source/tools/Scaling.cxx | 2 +- chart2/source/tools/SceneProperties.cxx | 2 +- chart2/source/tools/StatisticsHelper.cxx | 4 +- chart2/source/tools/ThreeDHelper.cxx | 32 +- chart2/source/tools/TitleHelper.cxx | 10 +- chart2/source/tools/TrueGuard.cxx | 2 +- chart2/source/tools/UncachedDataSequence.cxx | 2 +- chart2/source/tools/UserDefinedProperties.cxx | 2 +- chart2/source/tools/WeakListenerAdapter.cxx | 2 +- chart2/source/tools/WrappedDefaultProperty.cxx | 2 +- chart2/source/tools/WrappedDirectStateProperty.cxx | 2 +- chart2/source/tools/WrappedIgnoreProperty.cxx | 2 +- chart2/source/tools/WrappedProperty.cxx | 4 +- chart2/source/tools/WrappedPropertySet.cxx | 4 +- chart2/source/tools/XMLRangeHelper.cxx | 2 +- chart2/source/tools/_serviceregistration_tools.cxx | 2 +- .../source/view/axes/MinimumAndMaximumSupplier.cxx | 2 +- chart2/source/view/axes/ScaleAutomatism.cxx | 4 +- chart2/source/view/axes/TickmarkHelper.cxx | 6 +- chart2/source/view/axes/TickmarkHelper.hxx | 4 +- chart2/source/view/axes/TickmarkProperties.hxx | 2 +- chart2/source/view/axes/VAxisBase.cxx | 4 +- chart2/source/view/axes/VAxisBase.hxx | 4 +- chart2/source/view/axes/VAxisOrGridBase.cxx | 2 +- chart2/source/view/axes/VAxisOrGridBase.hxx | 2 +- chart2/source/view/axes/VAxisProperties.cxx | 12 +- chart2/source/view/axes/VAxisProperties.hxx | 2 +- chart2/source/view/axes/VCartesianAxis.cxx | 46 +- chart2/source/view/axes/VCartesianAxis.hxx | 4 +- .../view/axes/VCartesianCoordinateSystem.cxx | 6 +- .../view/axes/VCartesianCoordinateSystem.hxx | 4 +- chart2/source/view/axes/VCartesianGrid.cxx | 8 +- chart2/source/view/axes/VCartesianGrid.hxx | 2 +- chart2/source/view/axes/VCoordinateSystem.cxx | 18 +- chart2/source/view/axes/VPolarAngleAxis.cxx | 12 +- chart2/source/view/axes/VPolarAngleAxis.hxx | 2 +- chart2/source/view/axes/VPolarAxis.cxx | 2 +- chart2/source/view/axes/VPolarAxis.hxx | 2 +- chart2/source/view/axes/VPolarCoordinateSystem.cxx | 10 +- chart2/source/view/axes/VPolarCoordinateSystem.hxx | 2 +- chart2/source/view/axes/VPolarGrid.cxx | 10 +- chart2/source/view/axes/VPolarGrid.hxx | 2 +- chart2/source/view/axes/VPolarRadiusAxis.cxx | 6 +- chart2/source/view/axes/VPolarRadiusAxis.hxx | 4 +- chart2/source/view/charttypes/AreaChart.cxx | 14 +- chart2/source/view/charttypes/AreaChart.hxx | 12 +- chart2/source/view/charttypes/BarChart.cxx | 24 +- chart2/source/view/charttypes/BarChart.hxx | 2 +- .../source/view/charttypes/BarPositionHelper.cxx | 2 +- .../source/view/charttypes/BarPositionHelper.hxx | 2 +- chart2/source/view/charttypes/BubbleChart.cxx | 12 +- chart2/source/view/charttypes/BubbleChart.hxx | 4 +- chart2/source/view/charttypes/CandleStickChart.cxx | 10 +- chart2/source/view/charttypes/CandleStickChart.hxx | 2 +- .../view/charttypes/CategoryPositionHelper.cxx | 2 +- .../view/charttypes/CategoryPositionHelper.hxx | 2 +- chart2/source/view/charttypes/PieChart.cxx | 18 +- chart2/source/view/charttypes/PieChart.hxx | 4 +- chart2/source/view/charttypes/Splines.cxx | 20 +- chart2/source/view/charttypes/Splines.hxx | 2 +- chart2/source/view/charttypes/VSeriesPlotter.cxx | 38 +- chart2/source/view/diagram/VDiagram.cxx | 20 +- chart2/source/view/inc/Clipping.hxx | 10 +- chart2/source/view/inc/LabelAlignment.hxx | 2 +- chart2/source/view/inc/LabelPositionHelper.hxx | 2 +- chart2/source/view/inc/LegendEntryProvider.hxx | 2 +- chart2/source/view/inc/Linear3DTransformation.hxx | 2 +- .../source/view/inc/MinimumAndMaximumSupplier.hxx | 2 +- chart2/source/view/inc/PlotterBase.hxx | 8 +- chart2/source/view/inc/PlottingPositionHelper.hxx | 10 +- .../source/view/inc/PolarLabelPositionHelper.hxx | 2 +- chart2/source/view/inc/PropertyMapper.hxx | 2 +- chart2/source/view/inc/ScaleAutomatism.hxx | 6 +- chart2/source/view/inc/ShapeFactory.hxx | 2 +- chart2/source/view/inc/Stripe.hxx | 2 +- chart2/source/view/inc/VCoordinateSystem.hxx | 18 +- chart2/source/view/inc/VDataSeries.hxx | 4 +- chart2/source/view/inc/VDiagram.hxx | 4 +- chart2/source/view/inc/VLegendSymbolFactory.hxx | 2 +- chart2/source/view/inc/VLineProperties.hxx | 2 +- chart2/source/view/inc/VPolarTransformation.hxx | 2 +- chart2/source/view/inc/VSeriesPlotter.hxx | 20 +- chart2/source/view/inc/ViewDefines.hxx | 2 +- chart2/source/view/main/ChartItemPool.cxx | 144 +- chart2/source/view/main/ChartItemPool.hxx | 4 +- chart2/source/view/main/ChartView.cxx | 104 +- chart2/source/view/main/ChartView.hxx | 12 +- chart2/source/view/main/Clipping.cxx | 66 +- .../source/view/main/DataPointSymbolSupplier.cxx | 4 +- chart2/source/view/main/DrawModelWrapper.cxx | 2 +- chart2/source/view/main/LabelPositionHelper.cxx | 4 +- chart2/source/view/main/Linear3DTransformation.cxx | 2 +- chart2/source/view/main/NumberFormatterWrapper.cxx | 2 +- chart2/source/view/main/PlotterBase.cxx | 4 +- chart2/source/view/main/PlottingPositionHelper.cxx | 18 +- .../source/view/main/PolarLabelPositionHelper.cxx | 8 +- chart2/source/view/main/PropertyMapper.cxx | 10 +- chart2/source/view/main/ShapeFactory.cxx | 14 +- chart2/source/view/main/Stripe.cxx | 14 +- chart2/source/view/main/VDataSeries.cxx | 10 +- chart2/source/view/main/VLegend.cxx | 6 +- chart2/source/view/main/VLegend.hxx | 4 +- chart2/source/view/main/VLegendSymbolFactory.cxx | 4 +- chart2/source/view/main/VLineProperties.cxx | 4 +- chart2/source/view/main/VPolarTransformation.cxx | 8 +- chart2/source/view/main/VTitle.cxx | 4 +- chart2/source/view/main/VTitle.hxx | 4 +- .../source/view/main/_serviceregistration_view.cxx | 2 +- chart2/uiconfig/menubar/menubar.xml | 2 +- chart2/uiconfig/toolbar/arrowshapes.xml | 22 +- chart2/uiconfig/toolbar/basicshapes.xml | 14 +- chart2/uiconfig/toolbar/flowchartshapes.xml | 26 +- chart2/uiconfig/toolbar/symbolshapes.xml | 6 +- chart2/workbench/addin/sampleaddin.cxx | 62 +- chart2/workbench/addin/sampleaddin.hxx | 6 +- sc/addin/datefunc/dfa.src | 2 +- sc/addin/inc/addin.h | 20 +- sc/addin/inc/dfa.hrc | 2 +- sc/addin/inc/rot13.hrc | 2 +- sc/addin/rot13/rot13.src | 2 +- sc/addin/util/cl2c.pl | 4 +- sc/inc/AccessibleFilterMenu.hxx | 4 +- sc/inc/AccessibleFilterMenuItem.hxx | 24 +- sc/inc/AccessibleFilterTopWindow.hxx | 4 +- sc/inc/AccessibleGlobal.hxx | 12 +- sc/inc/ViewSettingsSequenceDefines.hxx | 110 +- sc/inc/addincfg.hxx | 10 +- sc/inc/addincol.hxx | 102 +- sc/inc/address.hxx | 34 +- sc/inc/addruno.hxx | 2 +- sc/inc/afmtuno.hxx | 64 +- sc/inc/appluno.hxx | 26 +- sc/inc/appoptio.hxx | 118 +- sc/inc/arealink.hxx | 26 +- sc/inc/attarray.hxx | 150 +- sc/inc/attrib.hxx | 90 +- sc/inc/autoform.hxx | 2 +- sc/inc/autonamecache.hxx | 4 +- sc/inc/bigrange.hxx | 72 +- sc/inc/brdcst.hxx | 18 +- sc/inc/callform.hxx | 52 +- sc/inc/cell.hxx | 208 +- sc/inc/cellform.hxx | 12 +- sc/inc/cellsuno.hxx | 414 +-- sc/inc/cfgids.hxx | 8 +- sc/inc/chart2uno.hxx | 46 +- sc/inc/chartarr.hxx | 44 +- sc/inc/charthelper.hxx | 2 +- sc/inc/chartlis.hxx | 110 +- sc/inc/chartlock.hxx | 18 +- sc/inc/chartpos.hxx | 92 +- sc/inc/chartuno.hxx | 40 +- sc/inc/chgtrack.hxx | 720 +++--- sc/inc/chgviset.hxx | 94 +- sc/inc/clipparam.hxx | 18 +- sc/inc/collect.hxx | 66 +- sc/inc/column.hxx | 388 +-- sc/inc/compiler.hxx | 20 +- sc/inc/compressedarray.hxx | 4 +- sc/inc/conditio.hxx | 174 +- sc/inc/confuno.hxx | 20 +- sc/inc/consoli.hxx | 112 +- sc/inc/convuno.hxx | 30 +- sc/inc/cursuno.hxx | 34 +- sc/inc/dapiuno.hxx | 94 +- sc/inc/datauno.hxx | 220 +- sc/inc/dbcolect.hxx | 266 +- sc/inc/dbdocutl.hxx | 2 +- sc/inc/dbtoken.hxx | 2 +- sc/inc/defltuno.hxx | 22 +- sc/inc/detdata.hxx | 28 +- sc/inc/detfunc.hxx | 68 +- sc/inc/dispuno.hxx | 34 +- sc/inc/dociter.hxx | 318 +-- sc/inc/docoptio.hxx | 156 +- sc/inc/docpool.hxx | 48 +- sc/inc/document.hxx | 1322 +++++----- sc/inc/docuno.hxx | 208 +- sc/inc/dpcachetable.hxx | 8 +- sc/inc/dpdimsave.hxx | 2 +- sc/inc/dpglobal.hxx | 114 +- sc/inc/dpgroup.hxx | 16 +- sc/inc/dpobject.hxx | 164 +- sc/inc/dpoutput.hxx | 88 +- sc/inc/dpoutputgeometry.hxx | 6 +- sc/inc/dpsave.hxx | 148 +- sc/inc/dpsdbtab.hxx | 32 +- sc/inc/dpshttab.hxx | 40 +- sc/inc/dptabdat.hxx | 88 +- sc/inc/dptablecache.hxx | 56 +- sc/inc/dptabres.hxx | 294 +-- sc/inc/dptabsrc.hxx | 376 +-- sc/inc/drawattr.hxx | 12 +- sc/inc/drawpage.hxx | 2 +- sc/inc/drdefuno.hxx | 10 +- sc/inc/drwlayer.hxx | 112 +- sc/inc/editsrc.hxx | 102 +- sc/inc/editutil.hxx | 124 +- sc/inc/eventuno.hxx | 2 +- sc/inc/externalrefmgr.hxx | 52 +- sc/inc/fielduno.hxx | 146 +- sc/inc/fillinfo.hxx | 2 +- sc/inc/filter.hxx | 54 +- sc/inc/filtopt.hxx | 20 +- sc/inc/filtuno.hxx | 22 +- sc/inc/fmtuno.hxx | 82 +- sc/inc/forbiuno.hxx | 12 +- sc/inc/formulaparserpool.hxx | 2 +- sc/inc/formularesult.hxx | 6 +- sc/inc/funcdesc.hxx | 10 +- sc/inc/funcuno.hxx | 36 +- sc/inc/global.hxx | 560 ++-- sc/inc/globstr.hrc | 646 ++--- sc/inc/hints.hxx | 108 +- sc/inc/inputopt.hxx | 32 +- sc/inc/linkuno.hxx | 158 +- sc/inc/listenercalls.hxx | 2 +- sc/inc/lookupcache.hxx | 2 +- sc/inc/markarr.hxx | 42 +- sc/inc/markdata.hxx | 98 +- sc/inc/miscuno.hxx | 126 +- sc/inc/mutexhlp.hxx | 6 +- sc/inc/nameuno.hxx | 84 +- sc/inc/navicfg.hxx | 20 +- sc/inc/notesuno.hxx | 146 +- sc/inc/olinetab.hxx | 2 +- sc/inc/optuno.hxx | 14 +- sc/inc/optutil.hxx | 24 +- sc/inc/pagepar.hxx | 58 +- sc/inc/pageuno.hxx | 4 +- sc/inc/paramisc.hxx | 32 +- sc/inc/patattr.hxx | 60 +- sc/inc/pch/precompiled_sc.cxx | 2 +- sc/inc/pch/precompiled_sc.hxx | 2 +- sc/inc/pivot.hxx | 24 +- sc/inc/postit.hxx | 2 +- sc/inc/printopt.hxx | 28 +- sc/inc/prnsave.hxx | 16 +- sc/inc/progress.hxx | 64 +- sc/inc/queryparam.hxx | 2 +- sc/inc/rangelst.hxx | 46 +- sc/inc/rangenam.hxx | 152 +- sc/inc/rangeseq.hxx | 22 +- sc/inc/rangeutl.hxx | 118 +- sc/inc/rechead.hxx | 194 +- sc/inc/recursionhelper.hxx | 4 +- sc/inc/refdata.hxx | 4 +- sc/inc/reffind.hxx | 22 +- sc/inc/refreshtimer.hxx | 48 +- sc/inc/reftokenhelper.hxx | 10 +- sc/inc/sc.hrc | 2108 +++++++-------- sc/inc/scabstdlg.hxx | 212 +- sc/inc/scdll.hxx | 18 +- sc/inc/scerrors.hxx | 2 +- sc/inc/scextopt.hxx | 2 +- sc/inc/scfuncs.hrc | 562 ++-- sc/inc/scitems.hxx | 142 +- sc/inc/scmatrix.hxx | 19 +- sc/inc/scmod.hxx | 214 +- sc/inc/scresid.hxx | 4 +- sc/inc/scwarngs.hxx | 4 +- sc/inc/segmenttree.hxx | 2 +- sc/inc/servuno.hxx | 90 +- sc/inc/shapeuno.hxx | 44 +- sc/inc/sheetdata.hxx | 2 +- sc/inc/sheetevents.hxx | 4 +- sc/inc/shellids.hxx | 32 +- sc/inc/sortparam.hxx | 52 +- sc/inc/srchuno.hxx | 24 +- sc/inc/stlpool.hxx | 46 +- sc/inc/stlsheet.hxx | 26 +- sc/inc/stringutil.hxx | 12 +- sc/inc/strload.hxx | 2 +- sc/inc/styleuno.hxx | 78 +- sc/inc/subtotal.hxx | 12 +- sc/inc/table.hxx | 718 +++--- sc/inc/tablink.hxx | 46 +- sc/inc/tabopparams.hxx | 2 +- sc/inc/tabprotection.hxx | 18 +- sc/inc/targuno.hxx | 102 +- sc/inc/textuno.hxx | 154 +- sc/inc/token.hxx | 18 +- sc/inc/tokenarray.hxx | 4 +- sc/inc/tokenuno.hxx | 2 +- sc/inc/unitconv.hxx | 20 +- sc/inc/unoguard.hxx | 2 +- sc/inc/unonames.hxx | 862 +++---- sc/inc/unoreflist.hxx | 2 +- sc/inc/unowids.hxx | 68 +- sc/inc/userdat.hxx | 20 +- sc/inc/userlist.hxx | 36 +- sc/inc/validat.hxx | 90 +- sc/inc/viewopti.hxx | 64 +- sc/inc/viewuno.hxx | 94 +- sc/inc/waitoff.hxx | 6 +- sc/inc/warnpassword.hxx | 10 +- sc/inc/xmlwrap.hxx | 8 +- sc/inc/zforauto.hxx | 2 +- sc/qa/complex/calcPreview/ViewForwarder.java | 2 +- .../complex/cellRanges/CheckXCellRangesQuery.java | 6 +- sc/qa/complex/dataPilot/CheckDataPilot.java | 2 +- .../interfaceTests/beans/_XPropertySet.java | 14 +- .../interfaceTests/container/_XNamed.java | 6 +- .../sheet/_XDataPilotDescriptor.java | 2 +- .../interfaceTests/sheet/_XDataPilotTable.java | 8 +- sc/qa/complex/sc/CalcRTL.java | 98 +- sc/sdi/app.sdi | 16 +- sc/sdi/auditsh.sdi | 16 +- sc/sdi/cellsh.sdi | 364 +-- sc/sdi/chartsh.sdi | 2 +- sc/sdi/docsh.sdi | 96 +- sc/sdi/drawsh.sdi | 250 +- sc/sdi/drformsh.sdi | 2 +- sc/sdi/drtxtob.sdi | 168 +- sc/sdi/editsh.sdi | 76 +- sc/sdi/formatsh.sdi | 100 +- sc/sdi/graphsh.sdi | 4 +- sc/sdi/mediash.sdi | 2 +- sc/sdi/oleobjsh.sdi | 2 +- sc/sdi/pgbrksh.sdi | 2 +- sc/sdi/pivotsh.sdi | 8 +- sc/sdi/prevwsh.sdi | 44 +- sc/sdi/scalc.sdi | 8 +- sc/sdi/scslots.hrc | 2 +- sc/sdi/scslots.sdi | 2 +- sc/sdi/tabpopsh.sdi | 4 +- sc/sdi/tabvwsh.sdi | 230 +- sc/source/core/data/attarray.cxx | 312 +-- sc/source/core/data/attrib.cxx | 156 +- sc/source/core/data/autonamecache.cxx | 2 +- sc/source/core/data/bcaslot.cxx | 38 +- sc/source/core/data/cell.cxx | 72 +- sc/source/core/data/cell2.cxx | 8 +- sc/source/core/data/clipparam.cxx | 2 +- sc/source/core/data/column.cxx | 158 +- sc/source/core/data/column2.cxx | 244 +- sc/source/core/data/column3.cxx | 252 +- sc/source/core/data/compressedarray.cxx | 4 +- sc/source/core/data/conditio.cxx | 168 +- sc/source/core/data/dbdocutl.cxx | 10 +- sc/source/core/data/dociter.cxx | 150 +- sc/source/core/data/docpool.cxx | 488 ++-- sc/source/core/data/documen2.cxx | 112 +- sc/source/core/data/documen3.cxx | 184 +- sc/source/core/data/documen4.cxx | 176 +- sc/source/core/data/documen5.cxx | 36 +- sc/source/core/data/documen6.cxx | 26 +- sc/source/core/data/documen7.cxx | 46 +- sc/source/core/data/documen8.cxx | 230 +- sc/source/core/data/documen9.cxx | 84 +- sc/source/core/data/document.cxx | 282 +- sc/source/core/data/dpcachetable.cxx | 30 +- sc/source/core/data/dpdimsave.cxx | 2 +- sc/source/core/data/dpglobal.cxx | 12 +- sc/source/core/data/dpgroup.cxx | 76 +- sc/source/core/data/dpobject.cxx | 244 +- sc/source/core/data/dpoutput.cxx | 252 +- sc/source/core/data/dpoutputgeometry.cxx | 2 +- sc/source/core/data/dpsave.cxx | 94 +- sc/source/core/data/dpsdbtab.cxx | 34 +- sc/source/core/data/dpshttab.cxx | 20 +- sc/source/core/data/dptabdat.cxx | 64 +- sc/source/core/data/dptablecache.cxx | 180 +- sc/source/core/data/dptabres.cxx | 330 +-- sc/source/core/data/dptabsrc.cxx | 396 +-- sc/source/core/data/drawpage.cxx | 2 +- sc/source/core/data/drwlayer.cxx | 274 +- sc/source/core/data/fillinfo.cxx | 178 +- sc/source/core/data/global.cxx | 250 +- sc/source/core/data/global2.cxx | 348 +-- sc/source/core/data/globalx.cxx | 6 +- sc/source/core/data/markarr.cxx | 18 +- sc/source/core/data/markdata.cxx | 52 +- sc/source/core/data/olinetab.cxx | 2 +- sc/source/core/data/pagepar.cxx | 18 +- sc/source/core/data/patattr.cxx | 168 +- sc/source/core/data/pivot2.cxx | 4 +- sc/source/core/data/poolhelp.cxx | 14 +- sc/source/core/data/postit.cxx | 2 +- sc/source/core/data/scdpoutputimpl.cxx | 50 +- sc/source/core/data/scdpoutputimpl.hxx | 54 +- sc/source/core/data/segmenttree.cxx | 10 +- sc/source/core/data/sheetevents.cxx | 2 +- sc/source/core/data/sortparam.cxx | 112 +- sc/source/core/data/stlpool.cxx | 114 +- sc/source/core/data/stlsheet.cxx | 78 +- sc/source/core/data/tabbgcolor.cxx | 18 +- sc/source/core/data/table1.cxx | 166 +- sc/source/core/data/table2.cxx | 234 +- sc/source/core/data/table3.cxx | 250 +- sc/source/core/data/table4.cxx | 160 +- sc/source/core/data/table5.cxx | 62 +- sc/source/core/data/table6.cxx | 68 +- sc/source/core/data/tabprotection.cxx | 10 +- sc/source/core/data/userdat.cxx | 2 +- sc/source/core/data/validat.cxx | 132 +- sc/source/core/inc/addinhelpid.hxx | 2 +- sc/source/core/inc/addinlis.hxx | 28 +- sc/source/core/inc/adiasync.hxx | 38 +- sc/source/core/inc/bcaslot.hxx | 84 +- sc/source/core/inc/cellkeytranslator.hxx | 16 +- sc/source/core/inc/core_pch.hxx | 10 +- sc/source/core/inc/ddelink.hxx | 40 +- sc/source/core/inc/doubleref.hxx | 52 +- sc/source/core/inc/interpre.hxx | 12 +- sc/source/core/inc/jumpmatrix.hxx | 2 +- sc/source/core/inc/parclass.hxx | 10 +- sc/source/core/inc/poolhelp.hxx | 24 +- sc/source/core/inc/refupdat.hxx | 10 +- sc/source/core/inc/scrdata.hxx | 2 +- sc/source/core/src/compiler.src | 2 +- sc/source/core/tool/addincfg.cxx | 2 +- sc/source/core/tool/addincol.cxx | 4 +- sc/source/core/tool/addinhelpid.cxx | 2 +- sc/source/core/tool/addinlis.cxx | 38 +- sc/source/core/tool/address.cxx | 94 +- sc/source/core/tool/adiasync.cxx | 12 +- sc/source/core/tool/appoptio.cxx | 126 +- sc/source/core/tool/autoform.cxx | 60 +- sc/source/core/tool/callform.cxx | 96 +- sc/source/core/tool/cellform.cxx | 4 +- sc/source/core/tool/cellkeytranslator.cxx | 14 +- sc/source/core/tool/chartarr.cxx | 126 +- sc/source/core/tool/charthelper.cxx | 8 +- sc/source/core/tool/chartlis.cxx | 54 +- sc/source/core/tool/chartlock.cxx | 2 +- sc/source/core/tool/chartpos.cxx | 62 +- sc/source/core/tool/chgtrack.cxx | 220 +- sc/source/core/tool/chgviset.cxx | 56 +- sc/source/core/tool/collect.cxx | 58 +- sc/source/core/tool/compiler.cxx | 32 +- sc/source/core/tool/consoli.cxx | 120 +- sc/source/core/tool/dbcolect.cxx | 418 +-- sc/source/core/tool/ddelink.cxx | 84 +- sc/source/core/tool/detdata.cxx | 6 +- sc/source/core/tool/detfunc.cxx | 208 +- sc/source/core/tool/docoptio.cxx | 110 +- sc/source/core/tool/doubleref.cxx | 8 +- sc/source/core/tool/editutil.cxx | 82 +- sc/source/core/tool/filtopt.cxx | 20 +- sc/source/core/tool/formulaparserpool.cxx | 2 +- sc/source/core/tool/hints.cxx | 2 +- sc/source/core/tool/inputopt.cxx | 80 +- sc/source/core/tool/interpr1.cxx | 123 +- sc/source/core/tool/interpr2.cxx | 14 +- sc/source/core/tool/interpr3.cxx | 34 +- sc/source/core/tool/interpr4.cxx | 71 +- sc/source/core/tool/interpr5.cxx | 43 +- sc/source/core/tool/interpr6.cxx | 8 +- sc/source/core/tool/lookupcache.cxx | 2 +- sc/source/core/tool/navicfg.cxx | 12 +- sc/source/core/tool/odffmap.cxx | 2 +- sc/source/core/tool/optutil.cxx | 8 +- sc/source/core/tool/parclass.cxx | 2 +- sc/source/core/tool/printopt.cxx | 22 +- sc/source/core/tool/prnsave.cxx | 6 +- sc/source/core/tool/progress.cxx | 32 +- sc/source/core/tool/queryparam.cxx | 6 +- sc/source/core/tool/rangelst.cxx | 106 +- sc/source/core/tool/rangenam.cxx | 138 +- sc/source/core/tool/rangeseq.cxx | 16 +- sc/source/core/tool/rangeutl.cxx | 218 +- sc/source/core/tool/rechead.cxx | 12 +- sc/source/core/tool/refdata.cxx | 22 +- sc/source/core/tool/reffind.cxx | 24 +- sc/source/core/tool/refreshtimer.cxx | 2 +- sc/source/core/tool/reftokenhelper.cxx | 2 +- sc/source/core/tool/refupdat.cxx | 78 +- sc/source/core/tool/scmatrix.cxx | 33 +- sc/source/core/tool/stringutil.cxx | 2 +- sc/source/core/tool/subtotal.cxx | 2 +- sc/source/core/tool/token.cxx | 28 +- sc/source/core/tool/unitconv.cxx | 18 +- sc/source/core/tool/userlist.cxx | 10 +- sc/source/core/tool/viewopti.cxx | 266 +- sc/source/core/tool/zforauto.cxx | 16 +- sc/source/filter/dif/difexp.cxx | 48 +- sc/source/filter/dif/difimp.cxx | 144 +- sc/source/filter/excel/colrowst.cxx | 2 +- sc/source/filter/excel/excdoc.cxx | 10 +- sc/source/filter/excel/excel.cxx | 2 +- sc/source/filter/excel/excform.cxx | 476 ++-- sc/source/filter/excel/excform8.cxx | 438 ++-- sc/source/filter/excel/excimp8.cxx | 34 +- sc/source/filter/excel/excrecds.cxx | 84 +- sc/source/filter/excel/exctools.cxx | 82 +- sc/source/filter/excel/expop2.cxx | 6 +- sc/source/filter/excel/fontbuff.cxx | 40 +- sc/source/filter/excel/frmbase.cxx | 16 +- sc/source/filter/excel/impop.cxx | 102 +- sc/source/filter/excel/namebuff.cxx | 38 +- sc/source/filter/excel/read.cxx | 222 +- sc/source/filter/excel/tokstack.cxx | 122 +- sc/source/filter/excel/xechart.cxx | 2 +- sc/source/filter/excel/xecontent.cxx | 18 +- sc/source/filter/excel/xeescher.cxx | 2 +- sc/source/filter/excel/xeformula.cxx | 2 +- sc/source/filter/excel/xehelper.cxx | 2 +- sc/source/filter/excel/xelink.cxx | 2 +- sc/source/filter/excel/xename.cxx | 2 +- sc/source/filter/excel/xepage.cxx | 12 +- sc/source/filter/excel/xepivot.cxx | 12 +- sc/source/filter/excel/xerecord.cxx | 2 +- sc/source/filter/excel/xestream.cxx | 2 +- sc/source/filter/excel/xestring.cxx | 12 +- sc/source/filter/excel/xestyle.cxx | 2 +- sc/source/filter/excel/xetable.cxx | 22 +- sc/source/filter/excel/xeview.cxx | 4 +- sc/source/filter/excel/xichart.cxx | 4 +- sc/source/filter/excel/xicontent.cxx | 8 +- sc/source/filter/excel/xiescher.cxx | 28 +- sc/source/filter/excel/xiformula.cxx | 2 +- sc/source/filter/excel/xilink.cxx | 2 +- sc/source/filter/excel/xiname.cxx | 2 +- sc/source/filter/excel/xipage.cxx | 2 +- sc/source/filter/excel/xipivot.cxx | 8 +- sc/source/filter/excel/xiroot.cxx | 2 +- sc/source/filter/excel/xistream.cxx | 2 +- sc/source/filter/excel/xistring.cxx | 2 +- sc/source/filter/excel/xistyle.cxx | 2 +- sc/source/filter/excel/xiview.cxx | 2 +- sc/source/filter/excel/xladdress.cxx | 2 +- sc/source/filter/excel/xlchart.cxx | 4 +- sc/source/filter/excel/xlescher.cxx | 2 +- sc/source/filter/excel/xlformula.cxx | 2 +- sc/source/filter/excel/xlpage.cxx | 12 +- sc/source/filter/excel/xlpivot.cxx | 4 +- sc/source/filter/excel/xlroot.cxx | 2 +- sc/source/filter/excel/xlstyle.cxx | 2 +- sc/source/filter/excel/xltools.cxx | 2 +- sc/source/filter/excel/xltracer.cxx | 4 +- sc/source/filter/excel/xlview.cxx | 2 +- sc/source/filter/ftools/fapihelper.cxx | 2 +- sc/source/filter/ftools/fprogressbar.cxx | 2 +- sc/source/filter/ftools/ftools.cxx | 2 +- sc/source/filter/html/htmlexp.cxx | 172 +- sc/source/filter/html/htmlexp2.cxx | 14 +- sc/source/filter/html/htmlimp.cxx | 6 +- sc/source/filter/html/htmlpars.cxx | 2 +- sc/source/filter/inc/XclExpChangeTrack.hxx | 320 +-- sc/source/filter/inc/XclImpChangeTrack.hxx | 86 +- sc/source/filter/inc/biff.hxx | 12 +- sc/source/filter/inc/colrowst.hxx | 2 +- sc/source/filter/inc/decl.h | 2 +- sc/source/filter/inc/dif.hxx | 96 +- sc/source/filter/inc/eeimport.hxx | 2 +- sc/source/filter/inc/eeparser.hxx | 84 +- sc/source/filter/inc/excdefs.hxx | 52 +- sc/source/filter/inc/excdoc.hxx | 22 +- sc/source/filter/inc/excform.hxx | 32 +- sc/source/filter/inc/excimp8.hxx | 90 +- sc/source/filter/inc/excrecds.hxx | 120 +- sc/source/filter/inc/excscen.hxx | 44 +- sc/source/filter/inc/exp_op.hxx | 76 +- sc/source/filter/inc/expbase.hxx | 24 +- sc/source/filter/inc/fapihelper.hxx | 2 +- sc/source/filter/inc/filt_pch.hxx | 10 +- sc/source/filter/inc/fkttab.h | 2 +- sc/source/filter/inc/flttypes.hxx | 2 +- sc/source/filter/inc/formel.hxx | 96 +- sc/source/filter/inc/fprogressbar.hxx | 2 +- sc/source/filter/inc/ftools.hxx | 12 +- sc/source/filter/inc/funktion.h | 32 +- sc/source/filter/inc/htmlexp.hxx | 110 +- sc/source/filter/inc/htmlimp.hxx | 8 +- sc/source/filter/inc/htmlpars.hxx | 120 +- sc/source/filter/inc/imp_op.hxx | 114 +- sc/source/filter/inc/lotattr.hxx | 68 +- sc/source/filter/inc/lotfntbf.hxx | 40 +- sc/source/filter/inc/lotform.hxx | 90 +- sc/source/filter/inc/lotimpop.hxx | 76 +- sc/source/filter/inc/lotrange.hxx | 54 +- sc/source/filter/inc/namebuff.hxx | 116 +- sc/source/filter/inc/op.h | 10 +- sc/source/filter/inc/optab.h | 10 +- sc/source/filter/inc/otlnbuff.hxx | 32 +- sc/source/filter/inc/qpro.hxx | 2 +- sc/source/filter/inc/qproform.hxx | 44 +- sc/source/filter/inc/qprostyle.hxx | 2 +- sc/source/filter/inc/root.hxx | 40 +- sc/source/filter/inc/rtfexp.hxx | 16 +- sc/source/filter/inc/rtfimp.hxx | 2 +- sc/source/filter/inc/rtfparse.hxx | 44 +- sc/source/filter/inc/scflt.hxx | 842 +++--- sc/source/filter/inc/scfobj.hxx | 2 +- sc/source/filter/inc/scmem.h | 2 +- sc/source/filter/inc/tokstack.hxx | 198 +- sc/source/filter/inc/tool.h | 62 +- sc/source/filter/inc/xcl97dum.hxx | 2 +- sc/source/filter/inc/xcl97esc.hxx | 14 +- sc/source/filter/inc/xcl97rec.hxx | 126 +- sc/source/filter/inc/xechart.hxx | 2 +- sc/source/filter/inc/xecontent.hxx | 2 +- sc/source/filter/inc/xeescher.hxx | 2 +- sc/source/filter/inc/xeformula.hxx | 2 +- sc/source/filter/inc/xehelper.hxx | 2 +- sc/source/filter/inc/xename.hxx | 2 +- sc/source/filter/inc/xepage.hxx | 2 +- sc/source/filter/inc/xepivot.hxx | 2 +- sc/source/filter/inc/xerecord.hxx | 2 +- sc/source/filter/inc/xestream.hxx | 2 +- sc/source/filter/inc/xestring.hxx | 4 +- sc/source/filter/inc/xestyle.hxx | 2 +- sc/source/filter/inc/xetable.hxx | 8 +- sc/source/filter/inc/xeview.hxx | 2 +- sc/source/filter/inc/xichart.hxx | 2 +- sc/source/filter/inc/xicontent.hxx | 2 +- sc/source/filter/inc/xiescher.hxx | 2 +- sc/source/filter/inc/xiformula.hxx | 12 +- sc/source/filter/inc/xilink.hxx | 2 +- sc/source/filter/inc/xiname.hxx | 2 +- sc/source/filter/inc/xipage.hxx | 2 +- sc/source/filter/inc/xipivot.hxx | 2 +- sc/source/filter/inc/xiroot.hxx | 2 +- sc/source/filter/inc/xistream.hxx | 2 +- sc/source/filter/inc/xistring.hxx | 2 +- sc/source/filter/inc/xistyle.hxx | 2 +- sc/source/filter/inc/xiview.hxx | 2 +- sc/source/filter/inc/xladdress.hxx | 2 +- sc/source/filter/inc/xlchart.hxx | 4 +- sc/source/filter/inc/xlconst.hxx | 2 +- sc/source/filter/inc/xlcontent.hxx | 2 +- sc/source/filter/inc/xlescher.hxx | 2 +- sc/source/filter/inc/xlformula.hxx | 2 +- sc/source/filter/inc/xllink.hxx | 2 +- sc/source/filter/inc/xlname.hxx | 2 +- sc/source/filter/inc/xlpage.hxx | 2 +- sc/source/filter/inc/xlpivot.hxx | 4 +- sc/source/filter/inc/xlroot.hxx | 2 +- sc/source/filter/inc/xlstream.hxx | 2 +- sc/source/filter/inc/xlstring.hxx | 2 +- sc/source/filter/inc/xlstyle.hxx | 2 +- sc/source/filter/inc/xltable.hxx | 2 +- sc/source/filter/inc/xltools.hxx | 4 +- sc/source/filter/inc/xltracer.hxx | 2 +- sc/source/filter/inc/xlview.hxx | 6 +- sc/source/filter/lotus/expop.cxx | 80 +- sc/source/filter/lotus/export.cxx | 2 +- sc/source/filter/lotus/filter.cxx | 46 +- sc/source/filter/lotus/lotattr.cxx | 36 +- sc/source/filter/lotus/lotform.cxx | 2680 ++++++++++---------- sc/source/filter/lotus/lotimpop.cxx | 98 +- sc/source/filter/lotus/lotread.cxx | 108 +- sc/source/filter/lotus/lotus.cxx | 10 +- sc/source/filter/lotus/memory.cxx | 52 +- sc/source/filter/lotus/op.cxx | 122 +- sc/source/filter/lotus/optab.cxx | 410 +-- sc/source/filter/lotus/tool.cxx | 94 +- sc/source/filter/qpro/biff.cxx | 2 +- sc/source/filter/qpro/qpro.cxx | 2 +- sc/source/filter/qpro/qproform.cxx | 6 +- sc/source/filter/qpro/qprostyle.cxx | 2 +- sc/source/filter/rtf/eeimpars.cxx | 36 +- sc/source/filter/rtf/expbase.cxx | 2 +- sc/source/filter/rtf/rtfexp.cxx | 48 +- sc/source/filter/rtf/rtfimp.cxx | 2 +- sc/source/filter/rtf/rtfparse.cxx | 52 +- sc/source/filter/starcalc/scflt.cxx | 300 +-- sc/source/filter/starcalc/scfobj.cxx | 6 +- sc/source/filter/xcl97/XclExpChangeTrack.cxx | 98 +- sc/source/filter/xcl97/XclImpChangeTrack.cxx | 28 +- sc/source/filter/xcl97/xcl97dum.cxx | 34 +- sc/source/filter/xcl97/xcl97esc.cxx | 8 +- sc/source/filter/xcl97/xcl97rec.cxx | 96 +- .../filter/xml/XMLCalculationSettingsContext.cxx | 2 +- .../filter/xml/XMLCalculationSettingsContext.hxx | 2 +- sc/source/filter/xml/XMLCellRangeSourceContext.cxx | 8 +- sc/source/filter/xml/XMLCellRangeSourceContext.hxx | 26 +- .../filter/xml/XMLChangeTrackingExportHelper.cxx | 16 +- .../filter/xml/XMLChangeTrackingExportHelper.hxx | 10 +- .../filter/xml/XMLChangeTrackingImportHelper.cxx | 12 +- .../filter/xml/XMLChangeTrackingImportHelper.hxx | 42 +- sc/source/filter/xml/XMLCodeNameProvider.cxx | 16 +- sc/source/filter/xml/XMLCodeNameProvider.hxx | 10 +- sc/source/filter/xml/XMLColumnRowGroupExport.cxx | 8 +- sc/source/filter/xml/XMLColumnRowGroupExport.hxx | 16 +- sc/source/filter/xml/XMLConsolidationContext.cxx | 14 +- sc/source/filter/xml/XMLConsolidationContext.hxx | 24 +- sc/source/filter/xml/XMLConverter.cxx | 56 +- sc/source/filter/xml/XMLConverter.hxx | 26 +- sc/source/filter/xml/XMLDDELinksContext.cxx | 40 +- sc/source/filter/xml/XMLDDELinksContext.hxx | 36 +- sc/source/filter/xml/XMLDetectiveContext.cxx | 26 +- sc/source/filter/xml/XMLDetectiveContext.hxx | 72 +- sc/source/filter/xml/XMLEmptyContext.cxx | 2 +- sc/source/filter/xml/XMLEmptyContext.hxx | 6 +- sc/source/filter/xml/XMLExportDDELinks.cxx | 2 +- sc/source/filter/xml/XMLExportDDELinks.hxx | 10 +- sc/source/filter/xml/XMLExportDataPilot.cxx | 4 +- sc/source/filter/xml/XMLExportDataPilot.hxx | 6 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 28 +- sc/source/filter/xml/XMLExportDatabaseRanges.hxx | 6 +- sc/source/filter/xml/XMLExportIterator.cxx | 12 +- sc/source/filter/xml/XMLExportIterator.hxx | 286 +-- sc/source/filter/xml/XMLExportSharedData.cxx | 2 +- sc/source/filter/xml/XMLExportSharedData.hxx | 16 +- sc/source/filter/xml/XMLStylesExportHelper.cxx | 8 +- sc/source/filter/xml/XMLStylesExportHelper.hxx | 148 +- sc/source/filter/xml/XMLStylesImportHelper.cxx | 2 +- sc/source/filter/xml/XMLStylesImportHelper.hxx | 64 +- .../filter/xml/XMLTableHeaderFooterContext.cxx | 2 +- .../filter/xml/XMLTableHeaderFooterContext.hxx | 28 +- sc/source/filter/xml/XMLTableMasterPageExport.cxx | 2 +- sc/source/filter/xml/XMLTableMasterPageExport.hxx | 4 +- sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 +- sc/source/filter/xml/XMLTableShapeImportHelper.hxx | 2 +- sc/source/filter/xml/XMLTableShapeResizer.cxx | 8 +- sc/source/filter/xml/XMLTableShapeResizer.hxx | 16 +- sc/source/filter/xml/XMLTableShapesContext.cxx | 2 +- sc/source/filter/xml/XMLTableShapesContext.hxx | 2 +- sc/source/filter/xml/XMLTableSourceContext.cxx | 2 +- sc/source/filter/xml/XMLTableSourceContext.hxx | 14 +- sc/source/filter/xml/XMLTextPContext.cxx | 4 +- sc/source/filter/xml/XMLTextPContext.hxx | 12 +- sc/source/filter/xml/XMLTrackedChangesContext.cxx | 116 +- sc/source/filter/xml/XMLTrackedChangesContext.hxx | 4 +- sc/source/filter/xml/sheetdata.cxx | 2 +- sc/source/filter/xml/xmlannoi.cxx | 4 +- sc/source/filter/xml/xmlannoi.hxx | 2 +- sc/source/filter/xml/xmlbodyi.cxx | 32 +- sc/source/filter/xml/xmlbodyi.hxx | 8 +- sc/source/filter/xml/xmlcelli.cxx | 10 +- sc/source/filter/xml/xmlcelli.hxx | 36 +- sc/source/filter/xml/xmlcoli.cxx | 6 +- sc/source/filter/xml/xmlcoli.hxx | 24 +- sc/source/filter/xml/xmlconti.cxx | 2 +- sc/source/filter/xml/xmlconti.hxx | 2 +- sc/source/filter/xml/xmlcvali.cxx | 28 +- sc/source/filter/xml/xmlcvali.hxx | 2 +- sc/source/filter/xml/xmldpimp.cxx | 28 +- sc/source/filter/xml/xmldpimp.hxx | 116 +- sc/source/filter/xml/xmldrani.cxx | 8 +- sc/source/filter/xml/xmldrani.hxx | 56 +- sc/source/filter/xml/xmlexprt.cxx | 142 +- sc/source/filter/xml/xmlexprt.hxx | 86 +- sc/source/filter/xml/xmlexternaltabi.cxx | 16 +- sc/source/filter/xml/xmlexternaltabi.hxx | 2 +- sc/source/filter/xml/xmlfilti.cxx | 8 +- sc/source/filter/xml/xmlfilti.hxx | 62 +- sc/source/filter/xml/xmlfonte.cxx | 2 +- sc/source/filter/xml/xmlimprt.cxx | 436 ++-- sc/source/filter/xml/xmlimprt.hxx | 288 +-- sc/source/filter/xml/xmllabri.cxx | 18 +- sc/source/filter/xml/xmllabri.hxx | 28 +- sc/source/filter/xml/xmlnexpi.cxx | 8 +- sc/source/filter/xml/xmlnexpi.hxx | 2 +- sc/source/filter/xml/xmlrowi.cxx | 6 +- sc/source/filter/xml/xmlrowi.hxx | 2 +- sc/source/filter/xml/xmlsceni.cxx | 4 +- sc/source/filter/xml/xmlsceni.hxx | 18 +- sc/source/filter/xml/xmlsorti.cxx | 2 +- sc/source/filter/xml/xmlsorti.hxx | 24 +- sc/source/filter/xml/xmlstyle.cxx | 64 +- sc/source/filter/xml/xmlstyle.hxx | 102 +- sc/source/filter/xml/xmlstyli.cxx | 10 +- sc/source/filter/xml/xmlstyli.hxx | 34 +- sc/source/filter/xml/xmlsubti.cxx | 12 +- sc/source/filter/xml/xmlsubti.hxx | 140 +- sc/source/filter/xml/xmltabi.cxx | 22 +- sc/source/filter/xml/xmltabi.hxx | 6 +- sc/source/filter/xml/xmlwrap.cxx | 18 +- sc/source/ui/Accessibility/AccessibilityHints.cxx | 4 +- sc/source/ui/Accessibility/AccessibleCell.cxx | 6 +- sc/source/ui/Accessibility/AccessibleCellBase.cxx | 6 +- .../ui/Accessibility/AccessibleContextBase.cxx | 24 +- .../ui/Accessibility/AccessibleCsvControl.cxx | 4 +- .../Accessibility/AccessibleDataPilotControl.cxx | 30 +- sc/source/ui/Accessibility/AccessibleDocument.cxx | 22 +- .../ui/Accessibility/AccessibleDocumentBase.cxx | 6 +- .../AccessibleDocumentPagePreview.cxx | 28 +- .../ui/Accessibility/AccessibleEditObject.cxx | 8 +- .../ui/Accessibility/AccessibleFilterMenu.cxx | 34 +- .../ui/Accessibility/AccessibleFilterMenuItem.cxx | 2 +- .../ui/Accessibility/AccessibleFilterTopWindow.cxx | 12 +- sc/source/ui/Accessibility/AccessibleGlobal.cxx | 6 +- .../ui/Accessibility/AccessiblePageHeader.cxx | 12 +- .../ui/Accessibility/AccessiblePageHeaderArea.cxx | 12 +- .../ui/Accessibility/AccessiblePreviewCell.cxx | 8 +- .../Accessibility/AccessiblePreviewHeaderCell.cxx | 16 +- .../ui/Accessibility/AccessiblePreviewTable.cxx | 38 +- .../ui/Accessibility/AccessibleSpreadsheet.cxx | 10 +- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 10 +- sc/source/ui/Accessibility/AccessibleText.cxx | 130 +- .../ui/Accessibility/DrawModelBroadcaster.cxx | 4 +- sc/source/ui/app/client.cxx | 12 +- sc/source/ui/app/drwtrans.cxx | 2 +- sc/source/ui/app/inputhdl.cxx | 708 +++--- sc/source/ui/app/inputwin.cxx | 316 +-- sc/source/ui/app/lnktrans.cxx | 4 +- sc/source/ui/app/msgpool.cxx | 68 +- sc/source/ui/app/rfindlst.cxx | 6 +- sc/source/ui/app/scdll.cxx | 242 +- sc/source/ui/app/scmod.cxx | 350 +-- sc/source/ui/app/scmod2.cxx | 12 +- sc/source/ui/app/seltrans.cxx | 58 +- sc/source/ui/app/template.cxx | 2 +- sc/source/ui/app/transobj.cxx | 124 +- sc/source/ui/app/typemap.cxx | 6 +- sc/source/ui/app/uiitems.cxx | 116 +- sc/source/ui/app/wtcdummy.cxx | 2 +- sc/source/ui/attrdlg/attrdlg.cxx | 22 +- sc/source/ui/attrdlg/condfrmt.cxx | 128 +- sc/source/ui/attrdlg/scabstdlg.cxx | 4 +- sc/source/ui/attrdlg/scdlgfact.cxx | 180 +- sc/source/ui/attrdlg/scdlgfact.hxx | 262 +- sc/source/ui/attrdlg/scuiexp.cxx | 4 +- sc/source/ui/attrdlg/tabpages.cxx | 70 +- sc/source/ui/cctrl/cbuttonw.cxx | 36 +- sc/source/ui/cctrl/dpcontrol.cxx | 62 +- sc/source/ui/cctrl/dpcontrol.src | 2 +- sc/source/ui/cctrl/editfield.cxx | 2 +- sc/source/ui/cctrl/popmenu.cxx | 2 +- sc/source/ui/cctrl/tbinsert.cxx | 28 +- sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 32 +- sc/source/ui/dbgui/asciiopt.cxx | 118 +- sc/source/ui/dbgui/asciiopt.hrc | 38 +- sc/source/ui/dbgui/asciiopt.src | 2 +- sc/source/ui/dbgui/consdlg.cxx | 186 +- sc/source/ui/dbgui/consdlg.hrc | 4 +- sc/source/ui/dbgui/consdlg.src | 2 +- sc/source/ui/dbgui/csvcontrol.cxx | 2 +- sc/source/ui/dbgui/csvgrid.cxx | 2 +- sc/source/ui/dbgui/csvruler.cxx | 2 +- sc/source/ui/dbgui/csvsplits.cxx | 2 +- sc/source/ui/dbgui/csvtablebox.cxx | 2 +- sc/source/ui/dbgui/dapidata.cxx | 40 +- sc/source/ui/dbgui/dapitype.cxx | 18 +- sc/source/ui/dbgui/dapitype.hrc | 46 +- sc/source/ui/dbgui/dapitype.src | 2 +- sc/source/ui/dbgui/dbnamdlg.cxx | 216 +- sc/source/ui/dbgui/dpgroupdlg.cxx | 2 +- sc/source/ui/dbgui/dpgroupdlg.hrc | 2 +- sc/source/ui/dbgui/dpgroupdlg.src | 2 +- sc/source/ui/dbgui/expftext.cxx | 30 +- sc/source/ui/dbgui/fieldwnd.cxx | 10 +- sc/source/ui/dbgui/filtdlg.cxx | 330 +-- sc/source/ui/dbgui/foptmgr.cxx | 116 +- sc/source/ui/dbgui/imoptdlg.cxx | 12 +- sc/source/ui/dbgui/imoptdlg.hrc | 22 +- sc/source/ui/dbgui/imoptdlg.src | 4 +- sc/source/ui/dbgui/outline.src | 2 +- sc/source/ui/dbgui/pfiltdlg.cxx | 220 +- sc/source/ui/dbgui/pivot.hrc | 26 +- sc/source/ui/dbgui/pivot.src | 2 +- sc/source/ui/dbgui/pvfundlg.cxx | 4 +- sc/source/ui/dbgui/pvfundlg.hrc | 4 +- sc/source/ui/dbgui/pvfundlg.src | 2 +- sc/source/ui/dbgui/pvglob.hxx | 2 +- sc/source/ui/dbgui/pvlaydlg.cxx | 142 +- sc/source/ui/dbgui/scendlg.cxx | 50 +- sc/source/ui/dbgui/scendlg.hrc | 2 +- sc/source/ui/dbgui/scendlg.src | 2 +- sc/source/ui/dbgui/scuiasciiopt.cxx | 80 +- sc/source/ui/dbgui/scuiimoptdlg.cxx | 46 +- sc/source/ui/dbgui/sfiltdlg.cxx | 128 +- sc/source/ui/dbgui/sortdlg.cxx | 20 +- sc/source/ui/dbgui/subtdlg.cxx | 8 +- sc/source/ui/dbgui/textimportoptions.cxx | 4 +- sc/source/ui/dbgui/textimportoptions.src | 8 +- sc/source/ui/dbgui/tpsort.cxx | 272 +- sc/source/ui/dbgui/tpsubt.cxx | 254 +- sc/source/ui/dbgui/validate.cxx | 96 +- sc/source/ui/dbgui/validate.src | 8 +- sc/source/ui/docshell/arealink.cxx | 124 +- sc/source/ui/docshell/autostyl.cxx | 48 +- sc/source/ui/docshell/dbdocfun.cxx | 302 +-- sc/source/ui/docshell/dbdocimp.cxx | 132 +- sc/source/ui/docshell/docfunc.cxx | 396 +-- sc/source/ui/docshell/docsh.cxx | 370 +-- sc/source/ui/docshell/docsh2.cxx | 32 +- sc/source/ui/docshell/docsh3.cxx | 170 +- sc/source/ui/docshell/docsh4.cxx | 300 +-- sc/source/ui/docshell/docsh5.cxx | 142 +- sc/source/ui/docshell/docsh6.cxx | 80 +- sc/source/ui/docshell/docsh7.cxx | 4 +- sc/source/ui/docshell/docsh8.cxx | 104 +- sc/source/ui/docshell/docshimp.hxx | 2 +- sc/source/ui/docshell/editable.cxx | 6 +- sc/source/ui/docshell/externalrefmgr.cxx | 18 +- sc/source/ui/docshell/hiranges.cxx | 2 +- sc/source/ui/docshell/impex.cxx | 154 +- sc/source/ui/docshell/olinefun.cxx | 64 +- sc/source/ui/docshell/pagedata.cxx | 4 +- sc/source/ui/docshell/pntlock.cxx | 2 +- sc/source/ui/docshell/servobj.cxx | 32 +- sc/source/ui/docshell/sizedev.cxx | 4 +- sc/source/ui/docshell/tablink.cxx | 84 +- sc/source/ui/docshell/tpstat.cxx | 24 +- sc/source/ui/docshell/tpstat.hrc | 14 +- sc/source/ui/docshell/tpstat.src | 4 +- sc/source/ui/drawfunc/chartsh.cxx | 2 +- sc/source/ui/drawfunc/drawsh.cxx | 58 +- sc/source/ui/drawfunc/drawsh2.cxx | 48 +- sc/source/ui/drawfunc/drawsh4.cxx | 14 +- sc/source/ui/drawfunc/drawsh5.cxx | 14 +- sc/source/ui/drawfunc/drformsh.cxx | 2 +- sc/source/ui/drawfunc/drformsh.src | 10 +- sc/source/ui/drawfunc/drtxtob.cxx | 118 +- sc/source/ui/drawfunc/drtxtob1.cxx | 16 +- sc/source/ui/drawfunc/drtxtob2.cxx | 54 +- sc/source/ui/drawfunc/fuconarc.cxx | 2 +- sc/source/ui/drawfunc/fuconcustomshape.cxx | 4 +- sc/source/ui/drawfunc/fuconpol.cxx | 18 +- sc/source/ui/drawfunc/fuconrec.cxx | 8 +- sc/source/ui/drawfunc/fuconstr.cxx | 24 +- sc/source/ui/drawfunc/fuconuno.cxx | 4 +- sc/source/ui/drawfunc/fudraw.cxx | 86 +- sc/source/ui/drawfunc/fuins1.cxx | 116 +- sc/source/ui/drawfunc/fuins2.cxx | 40 +- sc/source/ui/drawfunc/fumark.cxx | 28 +- sc/source/ui/drawfunc/fupoor.cxx | 46 +- sc/source/ui/drawfunc/fusel.cxx | 64 +- sc/source/ui/drawfunc/fusel2.cxx | 2 +- sc/source/ui/drawfunc/futext.cxx | 106 +- sc/source/ui/drawfunc/futext2.cxx | 10 +- sc/source/ui/drawfunc/futext3.cxx | 12 +- sc/source/ui/drawfunc/graphsh.cxx | 6 +- sc/source/ui/drawfunc/mediash.cxx | 14 +- sc/source/ui/drawfunc/objdraw.src | 38 +- sc/source/ui/drawfunc/oleobjsh.cxx | 2 +- sc/source/ui/formdlg/dwfunctr.cxx | 324 +-- sc/source/ui/formdlg/dwfunctr.hrc | 12 +- sc/source/ui/formdlg/dwfunctr.src | 2 +- sc/source/ui/formdlg/formdata.cxx | 2 +- sc/source/ui/formdlg/formdlgs.src | 2 +- sc/source/ui/formdlg/formula.cxx | 74 +- sc/source/ui/formdlg/privsplt.cxx | 94 +- sc/source/ui/inc/AccessibilityHints.hxx | 24 +- sc/source/ui/inc/AccessibleCell.hxx | 18 +- sc/source/ui/inc/AccessibleCellBase.hxx | 32 +- sc/source/ui/inc/AccessibleContextBase.hxx | 58 +- sc/source/ui/inc/AccessibleCsvControl.hxx | 2 +- sc/source/ui/inc/AccessibleDataPilotControl.hxx | 26 +- sc/source/ui/inc/AccessibleDocument.hxx | 82 +- sc/source/ui/inc/AccessibleDocumentBase.hxx | 6 +- sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 24 +- sc/source/ui/inc/AccessibleEditObject.hxx | 30 +- sc/source/ui/inc/AccessiblePageHeader.hxx | 10 +- sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 16 +- sc/source/ui/inc/AccessiblePreviewCell.hxx | 6 +- sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 30 +- sc/source/ui/inc/AccessiblePreviewTable.hxx | 22 +- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 38 +- sc/source/ui/inc/AccessibleTableBase.hxx | 22 +- sc/source/ui/inc/AccessibleText.hxx | 98 +- sc/source/ui/inc/ChartRangeSelectionListener.hxx | 2 +- sc/source/ui/inc/DrawModelBroadcaster.hxx | 10 +- sc/source/ui/inc/IAnyRefDialog.hxx | 6 +- sc/source/ui/inc/ScDevChart.hxx | 2 +- sc/source/ui/inc/acredlin.hrc | 70 +- sc/source/ui/inc/acredlin.hxx | 206 +- sc/source/ui/inc/anyrefdg.hxx | 38 +- sc/source/ui/inc/areasave.hxx | 32 +- sc/source/ui/inc/areasdlg.hxx | 56 +- sc/source/ui/inc/asciiopt.hxx | 102 +- sc/source/ui/inc/attrdlg.hrc | 26 +- sc/source/ui/inc/attrdlg.hxx | 8 +- sc/source/ui/inc/auditsh.hxx | 10 +- sc/source/ui/inc/autofmt.hxx | 116 +- sc/source/ui/inc/autostyl.hxx | 26 +- sc/source/ui/inc/cbutton.hxx | 28 +- sc/source/ui/inc/cellsh.hxx | 42 +- sc/source/ui/inc/chartsh.hxx | 4 +- sc/source/ui/inc/client.hxx | 16 +- sc/source/ui/inc/colrowba.hxx | 66 +- sc/source/ui/inc/condfrmt.hrc | 66 +- sc/source/ui/inc/condfrmt.hxx | 134 +- sc/source/ui/inc/conflictsdlg.hrc | 2 +- sc/source/ui/inc/conflictsdlg.hxx | 2 +- sc/source/ui/inc/consdlg.hxx | 94 +- sc/source/ui/inc/content.hxx | 116 +- sc/source/ui/inc/corodlg.hxx | 18 +- sc/source/ui/inc/crdlg.hxx | 22 +- sc/source/ui/inc/crnrdlg.hrc | 26 +- sc/source/ui/inc/crnrdlg.hxx | 60 +- sc/source/ui/inc/csvcontrol.hxx | 2 +- sc/source/ui/inc/csvgrid.hxx | 2 +- sc/source/ui/inc/csvruler.hxx | 2 +- sc/source/ui/inc/csvsplits.hxx | 2 +- sc/source/ui/inc/csvtablebox.hxx | 2 +- sc/source/ui/inc/dapidata.hxx | 24 +- sc/source/ui/inc/dapitype.hxx | 54 +- sc/source/ui/inc/dbdocfun.hxx | 30 +- sc/source/ui/inc/dbfunc.hxx | 56 +- sc/source/ui/inc/dbnamdlg.hrc | 16 +- sc/source/ui/inc/dbnamdlg.hxx | 88 +- sc/source/ui/inc/delcldlg.hxx | 16 +- sc/source/ui/inc/delcodlg.hxx | 34 +- sc/source/ui/inc/docfunc.hxx | 108 +- sc/source/ui/inc/docsh.hxx | 256 +- sc/source/ui/inc/dpcontrol.hrc | 2 +- sc/source/ui/inc/dpcontrol.hxx | 66 +- sc/source/ui/inc/dpgroupdlg.hxx | 2 +- sc/source/ui/inc/drawsh.hxx | 36 +- sc/source/ui/inc/drawutil.hxx | 4 +- sc/source/ui/inc/drawview.hxx | 90 +- sc/source/ui/inc/drformsh.hxx | 8 +- sc/source/ui/inc/drtxtob.hxx | 12 +- sc/source/ui/inc/drwtrans.hxx | 62 +- sc/source/ui/inc/dwfunctr.hxx | 98 +- sc/source/ui/inc/editable.hxx | 24 +- sc/source/ui/inc/editfield.hxx | 2 +- sc/source/ui/inc/editsh.hxx | 28 +- sc/source/ui/inc/expftext.hxx | 4 +- sc/source/ui/inc/fieldwnd.hxx | 2 +- sc/source/ui/inc/filldlg.hxx | 108 +- sc/source/ui/inc/filtdlg.hxx | 220 +- sc/source/ui/inc/filter.hrc | 80 +- sc/source/ui/inc/foptmgr.hxx | 82 +- sc/source/ui/inc/formatsh.hxx | 28 +- sc/source/ui/inc/formdata.hxx | 18 +- sc/source/ui/inc/formula.hxx | 20 +- sc/source/ui/inc/fuconarc.hxx | 8 +- sc/source/ui/inc/fuconcustomshape.hxx | 6 +- sc/source/ui/inc/fuconpol.hxx | 8 +- sc/source/ui/inc/fuconrec.hxx | 8 +- sc/source/ui/inc/fuconstr.hxx | 10 +- sc/source/ui/inc/fuconuno.hxx | 8 +- sc/source/ui/inc/fudraw.hxx | 8 +- sc/source/ui/inc/fuedipo.hxx | 8 +- sc/source/ui/inc/fuinsert.hxx | 20 +- sc/source/ui/inc/fumark.hxx | 14 +- sc/source/ui/inc/funcpage.hxx | 46 +- sc/source/ui/inc/funcutl.hxx | 114 +- sc/source/ui/inc/fupoor.hxx | 46 +- sc/source/ui/inc/fusel.hxx | 16 +- sc/source/ui/inc/futext.hxx | 16 +- sc/source/ui/inc/graphsh.hxx | 12 +- sc/source/ui/inc/gridmerg.hxx | 30 +- sc/source/ui/inc/gridwin.hxx | 352 +-- sc/source/ui/inc/groupdlg.hxx | 18 +- sc/source/ui/inc/hdrcont.hxx | 114 +- sc/source/ui/inc/hfedtdlg.hxx | 12 +- sc/source/ui/inc/highred.hrc | 48 +- sc/source/ui/inc/highred.hxx | 62 +- sc/source/ui/inc/hintwin.hxx | 16 +- sc/source/ui/inc/hiranges.hxx | 12 +- sc/source/ui/inc/imoptdlg.hxx | 40 +- sc/source/ui/inc/impex.hxx | 58 +- sc/source/ui/inc/inputhdl.hxx | 302 +-- sc/source/ui/inc/inputwin.hxx | 168 +- sc/source/ui/inc/inscldlg.hxx | 16 +- sc/source/ui/inc/inscodlg.hxx | 110 +- sc/source/ui/inc/instbdlg.hrc | 36 +- sc/source/ui/inc/instbdlg.hxx | 66 +- sc/source/ui/inc/invmerge.hxx | 16 +- sc/source/ui/inc/lbseldlg.hxx | 16 +- sc/source/ui/inc/linkarea.hrc | 26 +- sc/source/ui/inc/linkarea.hxx | 54 +- sc/source/ui/inc/lnktrans.hxx | 16 +- sc/source/ui/inc/mediash.hxx | 8 +- sc/source/ui/inc/miscdlgs.hrc | 132 +- sc/source/ui/inc/msgpool.hxx | 28 +- sc/source/ui/inc/mtrindlg.hxx | 36 +- sc/source/ui/inc/mvtabdlg.hxx | 38 +- sc/source/ui/inc/namecrea.hxx | 28 +- sc/source/ui/inc/namedlg.hrc | 32 +- sc/source/ui/inc/namedlg.hxx | 70 +- sc/source/ui/inc/namepast.hxx | 24 +- sc/source/ui/inc/navcitem.hxx | 4 +- sc/source/ui/inc/navipi.hxx | 210 +- sc/source/ui/inc/navsett.hxx | 2 +- sc/source/ui/inc/notemark.hxx | 40 +- sc/source/ui/inc/oleobjsh.hxx | 4 +- sc/source/ui/inc/olinefun.hxx | 22 +- sc/source/ui/inc/olinewin.hxx | 2 +- sc/source/ui/inc/opredlin.hrc | 24 +- sc/source/ui/inc/opredlin.hxx | 26 +- sc/source/ui/inc/optdlg.hrc | 198 +- sc/source/ui/inc/optload.hrc | 24 +- sc/source/ui/inc/optload.hxx | 24 +- sc/source/ui/inc/optsolver.hrc | 38 +- sc/source/ui/inc/optsolver.hxx | 2 +- sc/source/ui/inc/output.hxx | 200 +- sc/source/ui/inc/pagedata.hxx | 60 +- sc/source/ui/inc/parawin.hxx | 144 +- sc/source/ui/inc/pfiltdlg.hxx | 108 +- sc/source/ui/inc/pfuncache.hxx | 34 +- sc/source/ui/inc/pgbrksh.hxx | 2 +- sc/source/ui/inc/pivotsh.hxx | 8 +- sc/source/ui/inc/pntlock.hxx | 32 +- sc/source/ui/inc/popmenu.hxx | 10 +- sc/source/ui/inc/preview.hxx | 102 +- sc/source/ui/inc/prevloc.hxx | 108 +- sc/source/ui/inc/prevwsh.hxx | 76 +- sc/source/ui/inc/printfun.hxx | 356 +-- sc/source/ui/inc/privsplt.hxx | 52 +- sc/source/ui/inc/protectiondlg.hrc | 2 +- sc/source/ui/inc/protectiondlg.hxx | 2 +- sc/source/ui/inc/pvfundlg.hxx | 6 +- sc/source/ui/inc/pvlaydlg.hxx | 2 +- sc/source/ui/inc/redcom.hxx | 14 +- sc/source/ui/inc/reffact.hxx | 44 +- sc/source/ui/inc/refundo.hxx | 22 +- sc/source/ui/inc/retypepassdlg.hrc | 2 +- sc/source/ui/inc/retypepassdlg.hxx | 2 +- sc/source/ui/inc/rfindlst.hxx | 26 +- sc/source/ui/inc/scendlg.hxx | 30 +- sc/source/ui/inc/scui_def.hxx | 32 +- sc/source/ui/inc/scuiasciiopt.hxx | 2 +- sc/source/ui/inc/scuiautofmt.hxx | 62 +- sc/source/ui/inc/scuiimoptdlg.hxx | 32 +- sc/source/ui/inc/scuitphfedit.hxx | 94 +- sc/source/ui/inc/select.hxx | 78 +- sc/source/ui/inc/selectionstate.hxx | 2 +- sc/source/ui/inc/seltrans.hxx | 34 +- sc/source/ui/inc/servobj.hxx | 12 +- sc/source/ui/inc/sharedocdlg.hrc | 2 +- sc/source/ui/inc/sharedocdlg.hxx | 2 +- sc/source/ui/inc/shtabdlg.hxx | 6 +- sc/source/ui/inc/simpref.hrc | 14 +- sc/source/ui/inc/simpref.hxx | 72 +- sc/source/ui/inc/sizedev.hxx | 20 +- sc/source/ui/inc/solveroptions.hrc | 2 +- sc/source/ui/inc/solveroptions.hxx | 2 +- sc/source/ui/inc/solverutil.hxx | 2 +- sc/source/ui/inc/solvrdlg.hrc | 32 +- sc/source/ui/inc/solvrdlg.hxx | 60 +- sc/source/ui/inc/sortdlg.hrc | 36 +- sc/source/ui/inc/sortdlg.hxx | 24 +- sc/source/ui/inc/spelldialog.hxx | 2 +- sc/source/ui/inc/spelleng.hxx | 2 +- sc/source/ui/inc/spellparam.hxx | 2 +- sc/source/ui/inc/strindlg.hxx | 10 +- sc/source/ui/inc/styledlg.hrc | 6 +- sc/source/ui/inc/styledlg.hxx | 12 +- sc/source/ui/inc/submenu.hrc | 78 +- sc/source/ui/inc/subtdlg.hrc | 4 +- sc/source/ui/inc/subtdlg.hxx | 12 +- sc/source/ui/inc/tabbgcolordlg.hxx | 2 +- sc/source/ui/inc/tabcont.hxx | 34 +- sc/source/ui/inc/tabopdlg.hrc | 38 +- sc/source/ui/inc/tabopdlg.hxx | 82 +- sc/source/ui/inc/tabpages.hxx | 44 +- sc/source/ui/inc/tabpopsh.hxx | 6 +- sc/source/ui/inc/tabsplit.hxx | 16 +- sc/source/ui/inc/tabview.hxx | 490 ++-- sc/source/ui/inc/tabvwsh.hxx | 350 +-- sc/source/ui/inc/target.hxx | 8 +- sc/source/ui/inc/tbinsert.hrc | 8 +- sc/source/ui/inc/tbinsert.hxx | 22 +- sc/source/ui/inc/tbzoomsliderctrl.hxx | 4 +- sc/source/ui/inc/textdlgs.hxx | 16 +- sc/source/ui/inc/textimportoptions.hrc | 2 +- sc/source/ui/inc/textimportoptions.hxx | 2 +- sc/source/ui/inc/tpcalc.hxx | 48 +- sc/source/ui/inc/tphf.hxx | 34 +- sc/source/ui/inc/tphfedit.hxx | 162 +- sc/source/ui/inc/tpprint.hxx | 20 +- sc/source/ui/inc/tpsort.hxx | 132 +- sc/source/ui/inc/tpstat.hxx | 2 +- sc/source/ui/inc/tpsubt.hxx | 132 +- sc/source/ui/inc/tptable.hxx | 38 +- sc/source/ui/inc/tpusrlst.hxx | 104 +- sc/source/ui/inc/tpview.hxx | 74 +- sc/source/ui/inc/transobj.hxx | 80 +- sc/source/ui/inc/ui_pch.hxx | 12 +- sc/source/ui/inc/uiitems.hxx | 162 +- sc/source/ui/inc/undobase.hxx | 64 +- sc/source/ui/inc/undoblk.hxx | 732 +++--- sc/source/ui/inc/undocell.hxx | 254 +- sc/source/ui/inc/undodat.hxx | 396 +-- sc/source/ui/inc/undodraw.hxx | 34 +- sc/source/ui/inc/undoolk.hxx | 12 +- sc/source/ui/inc/undostyl.hxx | 50 +- sc/source/ui/inc/undotab.hxx | 346 +-- sc/source/ui/inc/undoutil.hxx | 10 +- sc/source/ui/inc/validate.hrc | 4 +- sc/source/ui/inc/validate.hxx | 120 +- sc/source/ui/inc/viewdata.hxx | 506 ++-- sc/source/ui/inc/viewfunc.hxx | 260 +- sc/source/ui/inc/viewutil.hxx | 46 +- sc/source/ui/inc/warnbox.hxx | 2 +- sc/source/ui/miscdlgs/acredlin.cxx | 128 +- sc/source/ui/miscdlgs/acredlin.src | 2 +- sc/source/ui/miscdlgs/anyrefdg.cxx | 136 +- sc/source/ui/miscdlgs/autofmt.cxx | 48 +- sc/source/ui/miscdlgs/conflictsdlg.cxx | 6 +- sc/source/ui/miscdlgs/conflictsdlg.src | 6 +- sc/source/ui/miscdlgs/crdlg.cxx | 12 +- sc/source/ui/miscdlgs/crnrdlg.cxx | 378 +-- sc/source/ui/miscdlgs/delcldlg.cxx | 2 +- sc/source/ui/miscdlgs/delcodlg.cxx | 4 +- sc/source/ui/miscdlgs/filldlg.cxx | 22 +- sc/source/ui/miscdlgs/groupdlg.cxx | 4 +- sc/source/ui/miscdlgs/highred.cxx | 40 +- sc/source/ui/miscdlgs/highred.src | 2 +- sc/source/ui/miscdlgs/inscldlg.cxx | 2 +- sc/source/ui/miscdlgs/inscodlg.cxx | 34 +- sc/source/ui/miscdlgs/instbdlg.cxx | 88 +- sc/source/ui/miscdlgs/instbdlg.src | 2 +- sc/source/ui/miscdlgs/lbseldlg.cxx | 4 +- sc/source/ui/miscdlgs/linkarea.cxx | 44 +- sc/source/ui/miscdlgs/linkarea.src | 2 +- sc/source/ui/miscdlgs/mtrindlg.cxx | 22 +- sc/source/ui/miscdlgs/mvtabdlg.cxx | 12 +- sc/source/ui/miscdlgs/namecrea.cxx | 32 +- sc/source/ui/miscdlgs/namepast.cxx | 18 +- sc/source/ui/miscdlgs/optsolver.cxx | 4 +- sc/source/ui/miscdlgs/protectiondlg.cxx | 2 +- sc/source/ui/miscdlgs/protectiondlg.src | 2 +- sc/source/ui/miscdlgs/redcom.cxx | 6 +- sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 +- sc/source/ui/miscdlgs/retypepassdlg.src | 2 +- sc/source/ui/miscdlgs/scuiautofmt.cxx | 80 +- sc/source/ui/miscdlgs/sharedocdlg.cxx | 2 +- sc/source/ui/miscdlgs/sharedocdlg.src | 4 +- sc/source/ui/miscdlgs/shtabdlg.cxx | 2 +- sc/source/ui/miscdlgs/simpref.cxx | 58 +- sc/source/ui/miscdlgs/solveroptions.cxx | 10 +- sc/source/ui/miscdlgs/solverutil.cxx | 2 +- sc/source/ui/miscdlgs/solvrdlg.cxx | 66 +- sc/source/ui/miscdlgs/strindlg.cxx | 2 +- sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2 +- sc/source/ui/miscdlgs/tabopdlg.cxx | 46 +- sc/source/ui/miscdlgs/textdlgs.cxx | 18 +- sc/source/ui/miscdlgs/warnbox.cxx | 2 +- sc/source/ui/namedlg/namedlg.cxx | 166 +- sc/source/ui/navipi/content.cxx | 170 +- sc/source/ui/navipi/navcitem.cxx | 20 +- sc/source/ui/navipi/navipi.cxx | 280 +- sc/source/ui/navipi/navipi.hrc | 56 +- sc/source/ui/navipi/navipi.src | 56 +- sc/source/ui/navipi/scenwnd.cxx | 4 +- sc/source/ui/optdlg/opredlin.cxx | 28 +- sc/source/ui/optdlg/tpcalc.cxx | 54 +- sc/source/ui/optdlg/tpprint.cxx | 10 +- sc/source/ui/optdlg/tpusrlst.cxx | 210 +- sc/source/ui/optdlg/tpview.cxx | 226 +- sc/source/ui/pagedlg/areasdlg.cxx | 128 +- sc/source/ui/pagedlg/hfedtdlg.cxx | 16 +- sc/source/ui/pagedlg/hfedtdlg.hrc | 10 +- sc/source/ui/pagedlg/hfedtdlg.src | 36 +- sc/source/ui/pagedlg/pagedlg.hrc | 72 +- sc/source/ui/pagedlg/pagedlg.src | 4 +- sc/source/ui/pagedlg/scuitphfedit.cxx | 88 +- sc/source/ui/pagedlg/tphf.cxx | 40 +- sc/source/ui/pagedlg/tphf.src | 2 +- sc/source/ui/pagedlg/tphfedit.cxx | 212 +- sc/source/ui/pagedlg/tptable.cxx | 154 +- sc/source/ui/src/attrdlg.src | 2 +- sc/source/ui/src/autofmt.src | 2 +- sc/source/ui/src/condfrmt.src | 2 +- sc/source/ui/src/crnrdlg.src | 4 +- sc/source/ui/src/dbnamdlg.src | 4 +- sc/source/ui/src/filter.src | 2 +- sc/source/ui/src/globstr.src | 2 +- sc/source/ui/src/hdrcont.src | 2 +- sc/source/ui/src/miscdlgs.src | 32 +- sc/source/ui/src/namedlg.src | 4 +- sc/source/ui/src/opredlin.src | 2 +- sc/source/ui/src/optdlg.src | 4 +- sc/source/ui/src/optsolver.src | 2 +- sc/source/ui/src/popup.src | 2 +- sc/source/ui/src/pseudo.src | 2 +- sc/source/ui/src/sc.src | 2 +- sc/source/ui/src/scerrors.src | 2 +- sc/source/ui/src/scfuncs.src | 534 ++-- sc/source/ui/src/scstring.src | 6 +- sc/source/ui/src/scwarngs.src | 2 +- sc/source/ui/src/simpref.src | 6 +- sc/source/ui/src/solveroptions.src | 2 +- sc/source/ui/src/solvrdlg.src | 2 +- sc/source/ui/src/sortdlg.src | 6 +- sc/source/ui/src/subtdlg.src | 6 +- sc/source/ui/src/tabopdlg.src | 2 +- sc/source/ui/src/textdlgs.src | 2 +- sc/source/ui/src/toolbox.src | 12 +- sc/source/ui/styleui/scstyles.src | 12 +- sc/source/ui/styleui/styledlg.cxx | 58 +- sc/source/ui/styleui/styledlg.src | 2 +- sc/source/ui/undo/areasave.cxx | 30 +- sc/source/ui/undo/refundo.cxx | 18 +- sc/source/ui/undo/target.cxx | 2 +- sc/source/ui/undo/undobase.cxx | 44 +- sc/source/ui/undo/undoblk.cxx | 260 +- sc/source/ui/undo/undoblk2.cxx | 18 +- sc/source/ui/undo/undoblk3.cxx | 366 +-- sc/source/ui/undo/undocell.cxx | 94 +- sc/source/ui/undo/undodat.cxx | 292 +-- sc/source/ui/undo/undodraw.cxx | 4 +- sc/source/ui/undo/undoolk.cxx | 4 +- sc/source/ui/undo/undostyl.cxx | 26 +- sc/source/ui/undo/undotab.cxx | 212 +- sc/source/ui/undo/undoutil.cxx | 2 +- .../ui/unoobj/ChartRangeSelectionListener.cxx | 4 +- sc/source/ui/unoobj/addruno.cxx | 2 +- sc/source/ui/unoobj/afmtuno.cxx | 86 +- sc/source/ui/unoobj/appluno.cxx | 108 +- sc/source/ui/unoobj/celllistsource.cxx | 14 +- sc/source/ui/unoobj/celllistsource.hxx | 2 +- sc/source/ui/unoobj/cellsuno.cxx | 1990 +++++++-------- sc/source/ui/unoobj/cellvaluebinding.cxx | 14 +- sc/source/ui/unoobj/cellvaluebinding.hxx | 2 +- sc/source/ui/unoobj/chart2uno.cxx | 230 +- sc/source/ui/unoobj/chartuno.cxx | 42 +- sc/source/ui/unoobj/confuno.cxx | 18 +- sc/source/ui/unoobj/convuno.cxx | 8 +- sc/source/ui/unoobj/cursuno.cxx | 56 +- sc/source/ui/unoobj/dapiuno.cxx | 78 +- sc/source/ui/unoobj/datauno.cxx | 338 +-- sc/source/ui/unoobj/defltuno.cxx | 70 +- sc/source/ui/unoobj/detreg.cxx | 12 +- sc/source/ui/unoobj/dispuno.cxx | 2 +- sc/source/ui/unoobj/docuno.cxx | 312 +-- sc/source/ui/unoobj/drdefuno.cxx | 10 +- sc/source/ui/unoobj/editsrc.cxx | 44 +- sc/source/ui/unoobj/fielduno.cxx | 194 +- sc/source/ui/unoobj/filtuno.cxx | 42 +- sc/source/ui/unoobj/fmtuno.cxx | 116 +- sc/source/ui/unoobj/forbiuno.cxx | 8 +- sc/source/ui/unoobj/funcuno.cxx | 100 +- sc/source/ui/unoobj/linkuno.cxx | 148 +- sc/source/ui/unoobj/listenercalls.cxx | 2 +- sc/source/ui/unoobj/miscuno.cxx | 68 +- sc/source/ui/unoobj/nameuno.cxx | 112 +- sc/source/ui/unoobj/notesuno.cxx | 56 +- sc/source/ui/unoobj/optuno.cxx | 32 +- sc/source/ui/unoobj/pageuno.cxx | 4 +- sc/source/ui/unoobj/scdetect.cxx | 56 +- sc/source/ui/unoobj/scdetect.hxx | 2 +- sc/source/ui/unoobj/servuno.cxx | 102 +- sc/source/ui/unoobj/shapeuno.cxx | 42 +- sc/source/ui/unoobj/srchuno.cxx | 48 +- sc/source/ui/unoobj/styleuno.cxx | 688 ++--- sc/source/ui/unoobj/targuno.cxx | 32 +- sc/source/ui/unoobj/textuno.cxx | 122 +- sc/source/ui/unoobj/tokenuno.cxx | 2 +- sc/source/ui/unoobj/unodoc.cxx | 2 +- sc/source/ui/unoobj/unoguard.cxx | 2 +- sc/source/ui/unoobj/unoreflist.cxx | 2 +- sc/source/ui/unoobj/viewuno.cxx | 168 +- sc/source/ui/unoobj/warnpassword.cxx | 12 +- sc/source/ui/vba/excelvbahelper.cxx | 38 +- sc/source/ui/vba/excelvbahelper.hxx | 8 +- sc/source/ui/vba/helperdecl.hxx | 4 +- sc/source/ui/vba/makefile.mk | 92 +- sc/source/ui/vba/service.cxx | 24 +- sc/source/ui/vba/testvba/launchTest.pl | 14 +- sc/source/ui/vba/testvba/runTests.pl | 4 +- sc/source/ui/vba/testvba/testResult.pl | 26 +- sc/source/ui/vba/testvba/testResults.pl | 24 +- sc/source/ui/vba/testvba/testvba.cxx | 76 +- sc/source/ui/vba/testvba/timestampsClean.pl | 2 +- sc/source/ui/vba/vbaapplication.cxx | 742 +++--- sc/source/ui/vba/vbaapplication.hxx | 10 +- sc/source/ui/vba/vbaassistant.cxx | 20 +- sc/source/ui/vba/vbaassistant.hxx | 4 +- sc/source/ui/vba/vbaaxes.cxx | 30 +- sc/source/ui/vba/vbaaxes.hxx | 4 +- sc/source/ui/vba/vbaaxis.cxx | 120 +- sc/source/ui/vba/vbaaxis.hxx | 6 +- sc/source/ui/vba/vbaaxistitle.cxx | 4 +- sc/source/ui/vba/vbaaxistitle.hxx | 2 +- sc/source/ui/vba/vbaborders.cxx | 90 +- sc/source/ui/vba/vbaborders.hxx | 12 +- sc/source/ui/vba/vbacharacters.cxx | 34 +- sc/source/ui/vba/vbacharacters.hxx | 2 +- sc/source/ui/vba/vbachart.cxx | 110 +- sc/source/ui/vba/vbachart.hxx | 8 +- sc/source/ui/vba/vbachartobject.cxx | 54 +- sc/source/ui/vba/vbachartobject.hxx | 8 +- sc/source/ui/vba/vbachartobjects.cxx | 36 +- sc/source/ui/vba/vbachartobjects.hxx | 10 +- sc/source/ui/vba/vbacharts.cxx | 20 +- sc/source/ui/vba/vbacharts.hxx | 10 +- sc/source/ui/vba/vbacharttitle.cxx | 4 +- sc/source/ui/vba/vbacharttitle.hxx | 2 +- sc/source/ui/vba/vbacomment.cxx | 8 +- sc/source/ui/vba/vbacomment.hxx | 2 +- sc/source/ui/vba/vbacomments.cxx | 10 +- sc/source/ui/vba/vbacomments.hxx | 4 +- sc/source/ui/vba/vbacondition.cxx | 24 +- sc/source/ui/vba/vbacondition.hxx | 10 +- sc/source/ui/vba/vbadialog.cxx | 10 +- sc/source/ui/vba/vbadialog.hxx | 2 +- sc/source/ui/vba/vbadialogs.cxx | 6 +- sc/source/ui/vba/vbadialogs.hxx | 4 +- sc/source/ui/vba/vbaeventshelper.cxx | 4 +- sc/source/ui/vba/vbaeventshelper.hxx | 4 +- sc/source/ui/vba/vbafont.cxx | 10 +- sc/source/ui/vba/vbafont.hxx | 2 +- sc/source/ui/vba/vbaformat.cxx | 168 +- sc/source/ui/vba/vbaformat.hxx | 14 +- sc/source/ui/vba/vbaformatcondition.cxx | 30 +- sc/source/ui/vba/vbaformatcondition.hxx | 12 +- sc/source/ui/vba/vbaformatconditions.cxx | 44 +- sc/source/ui/vba/vbaformatconditions.hxx | 6 +- sc/source/ui/vba/vbaglobals.cxx | 82 +- sc/source/ui/vba/vbaglobals.hxx | 9 +- sc/source/ui/vba/vbahelper.cxx | 100 +- sc/source/ui/vba/vbahyperlink.cxx | 4 +- sc/source/ui/vba/vbahyperlink.hxx | 6 +- sc/source/ui/vba/vbahyperlinks.cxx | 12 +- sc/source/ui/vba/vbahyperlinks.hxx | 12 +- sc/source/ui/vba/vbainterior.cxx | 58 +- sc/source/ui/vba/vbainterior.hxx | 8 +- sc/source/ui/vba/vbaname.cxx | 22 +- sc/source/ui/vba/vbaname.hxx | 6 +- sc/source/ui/vba/vbanames.cxx | 23 +- sc/source/ui/vba/vbanames.hxx | 10 +- sc/source/ui/vba/vbaoleobject.cxx | 32 +- sc/source/ui/vba/vbaoleobject.hxx | 4 +- sc/source/ui/vba/vbaoleobjects.cxx | 10 +- sc/source/ui/vba/vbaoleobjects.hxx | 6 +- sc/source/ui/vba/vbaoutline.cxx | 12 +- sc/source/ui/vba/vbaoutline.hxx | 6 +- sc/source/ui/vba/vbapagebreak.cxx | 30 +- sc/source/ui/vba/vbapagebreak.hxx | 18 +- sc/source/ui/vba/vbapagebreaks.cxx | 26 +- sc/source/ui/vba/vbapagebreaks.hxx | 14 +- sc/source/ui/vba/vbapagesetup.cxx | 26 +- sc/source/ui/vba/vbapagesetup.hxx | 10 +- sc/source/ui/vba/vbapalette.cxx | 8 +- sc/source/ui/vba/vbapalette.hxx | 4 +- sc/source/ui/vba/vbapane.cxx | 20 +- sc/source/ui/vba/vbapane.hxx | 2 +- sc/source/ui/vba/vbapivotcache.cxx | 8 +- sc/source/ui/vba/vbapivotcache.hxx | 4 +- sc/source/ui/vba/vbapivottable.cxx | 8 +- sc/source/ui/vba/vbapivottable.hxx | 4 +- sc/source/ui/vba/vbapivottables.cxx | 14 +- sc/source/ui/vba/vbapivottables.hxx | 8 +- sc/source/ui/vba/vbapropvalue.cxx | 8 +- sc/source/ui/vba/vbapropvalue.hxx | 8 +- sc/source/ui/vba/vbarange.cxx | 1024 ++++---- sc/source/ui/vba/vbarange.hxx | 32 +- sc/source/ui/vba/vbaseriescollection.cxx | 12 +- sc/source/ui/vba/vbaseriescollection.hxx | 6 +- sc/source/ui/vba/vbasheetobject.cxx | 4 +- sc/source/ui/vba/vbasheetobject.hxx | 6 +- sc/source/ui/vba/vbasheetobjects.cxx | 4 +- sc/source/ui/vba/vbasheetobjects.hxx | 4 +- sc/source/ui/vba/vbastyle.cxx | 32 +- sc/source/ui/vba/vbastyle.hxx | 8 +- sc/source/ui/vba/vbastyles.cxx | 20 +- sc/source/ui/vba/vbastyles.hxx | 8 +- sc/source/ui/vba/vbatextboxshape.cxx | 8 +- sc/source/ui/vba/vbatextboxshape.hxx | 4 +- sc/source/ui/vba/vbatextframe.cxx | 6 +- sc/source/ui/vba/vbatextframe.hxx | 2 +- sc/source/ui/vba/vbatitle.hxx | 10 +- sc/source/ui/vba/vbavalidation.cxx | 110 +- sc/source/ui/vba/vbavalidation.hxx | 8 +- sc/source/ui/vba/vbawindow.cxx | 242 +- sc/source/ui/vba/vbawindow.hxx | 16 +- sc/source/ui/vba/vbawindows.cxx | 18 +- sc/source/ui/vba/vbawindows.hxx | 8 +- sc/source/ui/vba/vbaworkbook.cxx | 63 +- sc/source/ui/vba/vbaworkbook.hxx | 8 +- sc/source/ui/vba/vbaworkbooks.cxx | 56 +- sc/source/ui/vba/vbaworkbooks.hxx | 10 +- sc/source/ui/vba/vbaworksheet.cxx | 163 +- sc/source/ui/vba/vbaworksheet.hxx | 16 +- sc/source/ui/vba/vbaworksheets.cxx | 78 +- sc/source/ui/vba/vbaworksheets.hxx | 6 +- sc/source/ui/vba/vbawsfunction.cxx | 16 +- sc/source/ui/vba/vbawsfunction.hxx | 4 +- sc/source/ui/view/auditsh.cxx | 6 +- sc/source/ui/view/cellsh.cxx | 136 +- sc/source/ui/view/cellsh1.cxx | 252 +- sc/source/ui/view/cellsh2.cxx | 208 +- sc/source/ui/view/cellsh3.cxx | 186 +- sc/source/ui/view/cellsh4.cxx | 96 +- sc/source/ui/view/colrowba.cxx | 36 +- sc/source/ui/view/dbfunc.cxx | 74 +- sc/source/ui/view/dbfunc2.cxx | 2 +- sc/source/ui/view/dbfunc3.cxx | 150 +- sc/source/ui/view/dbfunc4.cxx | 2 +- sc/source/ui/view/drawattr.cxx | 2 +- sc/source/ui/view/drawutil.cxx | 12 +- sc/source/ui/view/drawvie2.cxx | 8 +- sc/source/ui/view/drawvie3.cxx | 14 +- sc/source/ui/view/drawvie4.cxx | 46 +- sc/source/ui/view/drawview.cxx | 116 +- sc/source/ui/view/editsh.cxx | 106 +- sc/source/ui/view/formatsh.cxx | 290 +-- sc/source/ui/view/galwrap.cxx | 4 +- sc/source/ui/view/gridmerg.cxx | 24 +- sc/source/ui/view/gridwin.cxx | 974 +++---- sc/source/ui/view/gridwin2.cxx | 134 +- sc/source/ui/view/gridwin3.cxx | 66 +- sc/source/ui/view/gridwin4.cxx | 528 ++-- sc/source/ui/view/gridwin5.cxx | 60 +- sc/source/ui/view/hdrcont.cxx | 244 +- sc/source/ui/view/hintwin.cxx | 12 +- sc/source/ui/view/imapwrap.cxx | 6 +- sc/source/ui/view/invmerge.cxx | 20 +- sc/source/ui/view/notemark.cxx | 10 +- sc/source/ui/view/olinewin.cxx | 6 +- sc/source/ui/view/olkact.cxx | 12 +- sc/source/ui/view/output.cxx | 342 +-- sc/source/ui/view/output2.cxx | 602 ++--- sc/source/ui/view/output3.cxx | 18 +- sc/source/ui/view/pfuncache.cxx | 12 +- sc/source/ui/view/pgbrksh.cxx | 2 +- sc/source/ui/view/pivotsh.cxx | 2 +- sc/source/ui/view/preview.cxx | 80 +- sc/source/ui/view/prevloc.cxx | 46 +- sc/source/ui/view/prevwsh.cxx | 176 +- sc/source/ui/view/prevwsh2.cxx | 2 +- sc/source/ui/view/printfun.cxx | 680 ++--- sc/source/ui/view/reffact.cxx | 84 +- sc/source/ui/view/scextopt.cxx | 2 +- sc/source/ui/view/select.cxx | 124 +- sc/source/ui/view/selectionstate.cxx | 2 +- sc/source/ui/view/spelldialog.cxx | 2 +- sc/source/ui/view/spelleng.cxx | 2 +- sc/source/ui/view/tabcont.cxx | 68 +- sc/source/ui/view/tabpopsh.cxx | 2 +- sc/source/ui/view/tabsplit.cxx | 2 +- sc/source/ui/view/tabview.cxx | 394 +-- sc/source/ui/view/tabview2.cxx | 144 +- sc/source/ui/view/tabview3.cxx | 390 +-- sc/source/ui/view/tabview4.cxx | 102 +- sc/source/ui/view/tabview5.cxx | 114 +- sc/source/ui/view/tabvwsh.cxx | 4 +- sc/source/ui/view/tabvwsh2.cxx | 94 +- sc/source/ui/view/tabvwsh3.cxx | 168 +- sc/source/ui/view/tabvwsh4.cxx | 422 +-- sc/source/ui/view/tabvwsh5.cxx | 92 +- sc/source/ui/view/tabvwsh8.cxx | 6 +- sc/source/ui/view/tabvwsh9.cxx | 42 +- sc/source/ui/view/tabvwsha.cxx | 146 +- sc/source/ui/view/tabvwshb.cxx | 48 +- sc/source/ui/view/tabvwshc.cxx | 50 +- sc/source/ui/view/tabvwshd.cxx | 12 +- sc/source/ui/view/tabvwshe.cxx | 54 +- sc/source/ui/view/tabvwshf.cxx | 140 +- sc/source/ui/view/tabvwshg.cxx | 18 +- sc/source/ui/view/tabvwshh.cxx | 24 +- sc/source/ui/view/viewdata.cxx | 410 +-- sc/source/ui/view/viewfun2.cxx | 378 +-- sc/source/ui/view/viewfun3.cxx | 278 +- sc/source/ui/view/viewfun4.cxx | 60 +- sc/source/ui/view/viewfun5.cxx | 60 +- sc/source/ui/view/viewfun6.cxx | 8 +- sc/source/ui/view/viewfun7.cxx | 40 +- sc/source/ui/view/viewfunc.cxx | 460 ++-- sc/source/ui/view/viewutil.cxx | 30 +- sc/source/ui/view/waitoff.cxx | 2 +- sc/uiconfig/scalc/toolbar/arrowshapes.xml | 22 +- sc/uiconfig/scalc/toolbar/basicshapes.xml | 14 +- sc/uiconfig/scalc/toolbar/flowchartshapes.xml | 26 +- sc/uiconfig/scalc/toolbar/previewbar.xml | 2 +- sc/uiconfig/scalc/toolbar/symbolshapes.xml | 6 +- sc/util/createExtPackage.pl | 10 +- sc/util/hidother.src | 810 +++--- sc/workben/addin.cxx | 132 +- sc/workben/addin.hxx | 22 +- sc/workben/map.idl | 2 +- sc/workben/result.cxx | 12 +- sc/workben/result.hxx | 22 +- sc/workben/test.cxx | 432 ++-- sc/workben/testadd.idl | 2 +- sc/xml/ScSpreadsheetSettingsObj.xml | 2 +- scaddins/source/analysis/analysis.cxx | 248 +- scaddins/source/analysis/analysis.hrc | 540 ++-- scaddins/source/analysis/analysis.hxx | 220 +- scaddins/source/analysis/analysis.src | 1294 +++++----- scaddins/source/analysis/analysis_deffuncnames.src | 2 +- scaddins/source/analysis/analysis_funcnames.src | 2 +- scaddins/source/analysis/analysisadd.idl | 2 +- scaddins/source/analysis/analysisdefs.hxx | 34 +- scaddins/source/analysis/analysishelper.cxx | 504 ++-- scaddins/source/analysis/analysishelper.hxx | 322 +-- scaddins/source/analysis/bessel.cxx | 32 +- scaddins/source/analysis/bessel.hxx | 2 +- scaddins/source/analysis/financial.cxx | 48 +- scaddins/source/datefunc/dateadd.idl | 2 +- scaddins/source/datefunc/datefunc.cxx | 2 +- scaddins/source/datefunc/datefunc.hrc | 2 +- scaddins/source/datefunc/datefunc.hxx | 4 +- scaddins/source/datefunc/datefunc.src | 2 +- sccomp/source/solver/solver.cxx | 6 +- sccomp/source/solver/solver.hrc | 2 +- sccomp/source/solver/solver.hxx | 2 +- sccomp/source/solver/solver.src | 2 +- 2197 files changed, 52031 insertions(+), 52051 deletions(-) diff --git a/chart2/inc/pch/precompiled_chart2.cxx b/chart2/inc/pch/precompiled_chart2.cxx index a1ea4db5fe99..60c0f69ad2e0 100644 --- a/chart2/inc/pch/precompiled_chart2.cxx +++ b/chart2/inc/pch/precompiled_chart2.cxx @@ -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/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index 199564a9f024..06888d38d579 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -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/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx index 9028973936e0..823e4198c67d 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx @@ -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 @@ -72,7 +72,7 @@ OUString SAL_CALL AccStatisticsObject::getAccessibleName() return getToolTipText(); } -OUString SAL_CALL AccStatisticsObject::getImplementationName() +OUString SAL_CALL AccStatisticsObject::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "StatisticsObject" )); diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index da09342cd8b0..ee2392ae8bc2 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -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/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 00335eab296e..aba3ad273f08 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -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/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 2361cc62c389..db33f36c1f02 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -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/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index d74b5d9d11b9..1b42988389da 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -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/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index bbf6176641da..d4edfa0fb724 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -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/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index a1236b697a69..be73e745763d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -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/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 4833991ad7cc..dce38d072559 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -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/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 0ba078e82886..25a2c9bb85ce 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -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/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index 5014198761f8..63ec07705a7e 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -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/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index e70aa58b8df7..629201a9ceea 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -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 @@ -42,7 +42,7 @@ class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder public: AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ); virtual ~AccessibleViewForwarder(); - + // ________ IAccessibleViewforwarder ________ virtual BOOL IsValid() const; virtual Rectangle GetVisibleArea() const; diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx index b2599fec0c74..1c598966395b 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.cxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx @@ -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/chart2/source/controller/accessibility/ChartElementFactory.hxx b/chart2/source/controller/accessibility/ChartElementFactory.hxx index 399ba93c1b55..168350c360f9 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.hxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.hxx @@ -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/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 2e1636b4406b..c246426586d9 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -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/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index ec888d6f8f8d..bcd99d60edbe 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -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/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 6d53fb8b01f6..73d6e99d46f7 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -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 @@ -144,7 +144,7 @@ void lcl_AddPropertiesToVector( ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); - + rOutProperties.push_back( Property( C2U( "AutoMax" ), PROP_AXIS_AUTO_MAX, @@ -206,7 +206,7 @@ void lcl_AddPropertiesToVector( PROP_AXIS_CROSSOVER_VALUE, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::MAYBEVOID )); - + rOutProperties.push_back( Property( C2U( "Origin" ), @@ -242,7 +242,7 @@ void lcl_AddPropertiesToVector( PROP_AXIS_MARK_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); - + //Properties for labels: rOutProperties.push_back( @@ -538,7 +538,7 @@ const Sequence< beans::Property >& AxisWrapper::getPropertySequence() const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + aWrappedProperties.push_back( new WrappedTextRotationProperty() ); aWrappedProperties.push_back( new WrappedProperty( C2U( "Marks" ), C2U( "MajorTickmarks" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "HelpMarks" ), C2U( "MinorTickmarks" ) ) ); @@ -568,10 +568,10 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() } WrappedScaleProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + return aWrappedProperties; } diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 86bd52367bbe..c8da648d9d76 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -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 @@ -128,7 +128,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; - + tAxisType m_eType; ::com::sun::star::uno::Any m_aTemporaryHelpStepValue; }; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 1b0d8fb4889c..bf29904ed85e 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -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 @@ -209,7 +209,7 @@ awt::Rectangle Chart2ModelContact::GetDiagramRectangleIncludingAxes() const { awt::Rectangle aRect(0,0,0,0); uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) ); - + if( DiagramPositioningMode_INCLUDING == DiagramHelper::getDiagramPositioningMode( xDiagram ) ) aRect = DiagramHelper::getDiagramRectangleFromModel(m_xChartModel); else diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index e20167e216c2..6f2420f0e0e4 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -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/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 062dcc1a129d..a9a1160ce8ff 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -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 @@ -523,7 +523,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); if( !xChartDoc.is() ) return; - + // remember some diagram properties to reset later sal_Bool bStacked = sal_False; sal_Bool bPercent = sal_False; @@ -548,10 +548,10 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) DataSourceHelper::detectRangeSegmentation( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ), aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ); - + if( !bHasCategories && rDataOperator.setsCategories( bUseColumns ) ) bHasCategories = true; - + aRangeString = C2U("all"); uno::Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments( aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index d56397953d79..af101edd205d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -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 @@ -73,7 +73,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index d6487d425657..144fd7249bcf 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -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 @@ -1424,7 +1424,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( { if( !m_xShapeFactory.is() && m_xChartView.is() ) { - Reference< lang::XUnoTunnel> xUnoTunnel(m_xChartView,uno::UNO_QUERY); + Reference< lang::XUnoTunnel> xUnoTunnel(m_xChartView,uno::UNO_QUERY); if(xUnoTunnel.is()) { ExplicitValueProvider* pProvider = reinterpret_cast(xUnoTunnel->getSomething( diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index d69212512ebe..f7eda5e3d588 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -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 @@ -154,10 +154,10 @@ void lcl_AddPropertiesToVector_PointProperties( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } - + void lcl_AddPropertiesToVector_SeriesOnly( ::std::vector< Property > & rOutProperties ) -{ +{ rOutProperties.push_back( Property( C2U( "Axis" ), PROP_SERIES_ATTACHED_AXIS, @@ -195,7 +195,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrappe } WrappedSymbolProperties::addProperties( aProperties ); //for series and points WrappedDataCaptionProperties::addProperties( aProperties ); //for series and points - + ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::LineProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); @@ -489,11 +489,11 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any if( aArguments.getLength() >= 2 ) aArguments[1] >>= m_nPointIndex; } - + if( !m_xDataSeries.is() ) throw uno::Exception( C2U( "DataSeries index invalid" ), static_cast< ::cppu::OWeakObject * >( this )); - + //todo: check upper border of point index if( m_nPointIndex >= 0 ) @@ -660,7 +660,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const :: void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - if( m_eType == DATA_SERIES ) + if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); else { @@ -728,7 +728,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope WrappedSymbolProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact ); WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + //add unnamed fill properties (different inner names here) // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) ); // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillHatch" ), C2U( "HatchName" ) ) ); @@ -736,7 +736,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope //add unnamed line properties (different inner names here) // aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "LineDash" ), C2U( "LineDashName" ) ) ); - + aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) ); aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) ); aWrappedProperties.push_back( new WrappedLineColorProperty( this ) ); @@ -745,7 +745,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty( C2U( "LineWidth" ), C2U( "BorderWidth" ), C2U( "LineWidth" ), this ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillStyle" ), C2U( "FillStyle" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparence" ), C2U( "Transparency" ) ) ); - + aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny( drawing::LineJoint_ROUND ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparenceGradientName" ), C2U( "TransparencyGradientName" ) ) ); aWrappedProperties.push_back( new WrappedProperty( C2U( "FillGradientName" ), C2U( "GradientName" ) ) ); @@ -782,7 +782,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& r if( ! (rValue >>= m_bLinesAllowed) ) throw lang::IllegalArgumentException( C2U("Property Lines requires value of type sal_Bool"), 0, 0 ); } - + sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName( C2U("ErrorCategory") ); if( nErrorCategoryHandle == nHandle ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index b7246306959c..26a504feed8e 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -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 @@ -48,7 +48,7 @@ namespace chart namespace wrapper { - + class Chart2ModelContact; class DataSeriesPointWrapper : public ::cppu::ImplInheritanceHelper4< @@ -145,7 +145,7 @@ private: sal_Int32 m_nPointIndex; sal_Bool m_bLinesAllowed; - + //this should only be used, if the DataSeriesPointWrapper is initialized via the XInitialize interface //because a big change in the chartmodel may leed to an dataseriespointer thats not connected to the model anymore //with the indizes instead we are can aleays get the new dataseries diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index c0be0ddcbf0d..93d1e0201624 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -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 @@ -604,7 +604,7 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" ) , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" ) ) - + ; return g_aChartTypeNameMap; } @@ -750,7 +750,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); @@ -1161,7 +1161,7 @@ void SAL_CALL DiagramWrapper::dispose() // /-- MutexGuard aGuard( GetMutex()); - + DisposeHelper::DisposeAndClear( m_xXAxisTitle ); DisposeHelper::DisposeAndClear( m_xYAxisTitle ); DisposeHelper::DisposeAndClear( m_xZAxisTitle ); @@ -1389,7 +1389,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re StackMode eInnerStackMode; bool bHasDetectableInnerValue = detectInnerValue( eInnerStackMode ); - + if( !bHasDetectableInnerValue ) { m_aOuterValue = rOuterValue; @@ -1400,7 +1400,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re return; if( !bNewValue && eInnerStackMode != m_eStackMode ) return; - + Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) { @@ -1788,8 +1788,8 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) throw lang::IllegalArgumentException( C2U("Property AttributedDataPoints requires value of type uno::Sequence< uno::Sequence< sal_Int32 > >"), 0, 0 ); - - m_aOuterValue = rOuterValue; + + m_aOuterValue = rOuterValue; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); @@ -1811,7 +1811,7 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal { uno::Any aVal; if( i < aNewValue.getLength() ) - aVal <<= aNewValue[i]; + aVal <<= aNewValue[i]; else { //set empty sequence @@ -1983,7 +1983,7 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con throw lang::IllegalArgumentException( C2U("Property AutomaticSize requires value of type boolean"), 0, 0 ); try - { + { if( bNewValue ) { Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) ); @@ -2091,7 +2091,7 @@ const Sequence< beans::Property >& DiagramWrapper::getPropertySequence() const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAxisLabelExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); @@ -2104,7 +2104,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); - + aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED_PERCENT, m_spChart2ModelContact ) ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 111e24bd6a8b..1b4c8135381a 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -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,8 +66,8 @@ class DiagramWrapper : public ::cppu::ImplInheritanceHelper12< WrappedPropertySet , ::com::sun::star::chart::XDiagram , ::com::sun::star::chart::XAxisZSupplier - , ::com::sun::star::chart::XTwoAxisXSupplier // : XAxisXSupplier - , ::com::sun::star::chart::XTwoAxisYSupplier // : XAxisYSupplier + , ::com::sun::star::chart::XTwoAxisXSupplier // : XAxisXSupplier + , ::com::sun::star::chart::XTwoAxisYSupplier // : XAxisYSupplier , ::com::sun::star::chart::XStatisticDisplay , ::com::sun::star::chart::X3DDisplay , ::com::sun::star::chart::X3DDefaultSetter diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index ff36c4cebcc7..a14dbecbdf91 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -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/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index c731b6c22666..ee0c149517b3 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -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/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 02ffcb942c99..7d207fa6ef8c 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -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 @@ -309,7 +309,7 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 94434a387d4e..0cd481d30245 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -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/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index fdfc7c094aaf..c2545e78f059 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -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,7 +66,7 @@ const Sequence< Property > & lcl_GetPropertySequence() { // get properties ::std::vector< ::com::sun::star::beans::Property > aProperties; - + ::chart::LineProperties::AddPropertiesToVector( aProperties ); // ::chart::NamedLineProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); @@ -329,7 +329,7 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const ::rtl:: uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); - + if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 449a1f550860..5794143a47ca 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -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 @@ -62,10 +62,10 @@ class MinMaxLineWrapper : public MutexContainer , ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates - // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + , ::com::sun::star::beans::XMultiPropertyStates + // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx index 085128cddeeb..90db6c3d7658 100644 --- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx +++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx @@ -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/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 20785faa8b66..f3766873453b 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -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 @@ -250,7 +250,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) if(xPropertySet.is()) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); - + chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); @@ -327,7 +327,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue { OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); - + Reference< beans::XPropertySet > xProp( getFirstCharacterPropertySet(), uno::UNO_QUERY ); Reference< beans::XFastPropertySet > xFastProp( xProp, uno::UNO_QUERY ); if(xProp.is()) @@ -342,7 +342,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue rValue = xFastProp->getFastPropertyValue( nHandle ); } } - + } void TitleWrapper::setFastCharacterPropertyValue( @@ -532,14 +532,14 @@ const Sequence< beans::Property >& TitleWrapper::getPropertySequence() const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() { ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; - + aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) ); aWrappedProperties.push_back( new WrappedTextRotationProperty( m_eTitleType==TitleHelper::Y_AXIS_TITLE || m_eTitleType==TitleHelper::X_AXIS_TITLE ) ); aWrappedProperties.push_back( new WrappedStackedTextProperty() ); WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); - + return aWrappedProperties; } diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 63902e452ee3..835c69e2df9d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -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/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 338131c4f973..a52570300b85 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -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 @@ -67,7 +67,7 @@ const Sequence< Property > & lcl_GetPropertySequence() { // get properties ::std::vector< ::com::sun::star::beans::Property > aProperties; - + ::chart::LineProperties::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); // ::chart::NamedProperties::AddPropertiesToVector( aProperties ); @@ -294,7 +294,7 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const ::rtl::O { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); - + if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 5b028a6acc66..d978ae7873b1 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -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 @@ -61,10 +61,10 @@ class UpDownBarWrapper : public MutexContainer , ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::beans::XMultiPropertyStates - // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + , ::com::sun::star::beans::XMultiPropertyStates + // , ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // , ::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: @@ -120,7 +120,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; + ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; rtl::OUString m_aPropertySetName; ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index a43bc610fc0c..f2f662bee4a0 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -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/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 44cb241281e3..b70e900f5253 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 8315a22d8ab4..4b64d5c295f7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index e807873c82dc..d905c5df3e63 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 15ae48bc22dd..99afc793f001 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -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 @@ -78,7 +78,7 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, throw lang::IllegalArgumentException( C2U("Property AutomaticPosition requires value of type boolean"), 0, 0 ); try - { + { if( bNewValue ) { Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 1211f76c8f1f..72ed97d4ce07 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 0c4a98263a04..b6efacc89473 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -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 @@ -314,11 +314,11 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { sal_Bool bHasTitle = sal_False; - + Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); if( xTitle.is() && (TitleHelper::getCompleteString( xTitle ).getLength() != 0) ) bHasTitle = sal_True; - + Any aRet; aRet <<= bHasTitle; return aRet; @@ -343,7 +343,7 @@ public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedAxisLabelExistenceProperty(); - + virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx index a02e19d2a67c..f63d7883d79b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 5fca42c2b3ad..322c096c77b7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 34329d6d3a52..ac32feb5399c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index bc91136590cb..7f64d4c9fa8e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -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 @@ -75,7 +75,7 @@ enum sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) { sal_Int32 nCaption=0; - + if( rLabel.ShowNumber ) nCaption |= ::com::sun::star::chart::ChartDataCaption::VALUE; if( rLabel.ShowNumberInPercent ) @@ -84,14 +84,14 @@ sal_Int32 lcl_LabelToCaption( const chart2::DataPointLabel& rLabel ) nCaption |= ::com::sun::star::chart::ChartDataCaption::TEXT; if( rLabel.ShowLegendSymbol ) nCaption |= ::com::sun::star::chart::ChartDataCaption::SYMBOL; - + return nCaption; } chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) { chart2::DataPointLabel aLabel(false,false,false,false); - + if( nCaption & ::com::sun::star::chart::ChartDataCaption::VALUE ) aLabel.ShowNumber = true; if( nCaption & ::com::sun::star::chart::ChartDataCaption::PERCENT ) @@ -100,7 +100,7 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption ) aLabel.ShowCategoryName = true; if( nCaption & ::com::sun::star::chart::ChartDataCaption::SYMBOL ) aLabel.ShowLegendSymbol = true; - + return aLabel; } @@ -110,7 +110,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList { //if !spChart2ModelContact.get() is then the created properties do belong to a single series or single datapoint //otherwise they do belong to the whole diagram - + rList.push_back( new WrappedDataCaptionProperty( spChart2ModelContact, ePropertyType ) ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index f805d7e87fa0..889031f98929 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index a5dc9b23feed..711b47a7e6e5 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 1ec7180d5455..871fb5c7ac95 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 7a8d1554df7d..9083e9849f1b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 51e9b253150b..95b1e4a1c9ca 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index b0fc030d0fbf..de404cf24a44 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -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 @@ -151,7 +151,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons bool bSetScaleData = false; chart2::ScaleData aScaleData( xAxis->getScaleData() ); - + sal_Bool bBool = false; switch( eScaleProperty ) { @@ -271,7 +271,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons if( rOuterValue >>= bBool ) { bool bWasLogarithm = AxisHelper::isLogarithmic( aScaleData.Scaling ); - + // safe comparison between sal_Bool and bool if( (!bBool) != (!bWasLogarithm) ) { @@ -312,17 +312,17 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( m_aOuterValue ); - + Reference< chart2::XAxis > xAxis( xInnerPropertySet, uno::UNO_QUERY ); OSL_ENSURE(xAxis.is(),"need an XAxis"); if(!xAxis.is()) return aRet; - + chart2::ScaleData aScaleData( xAxis->getScaleData() ); - + chart2::ExplicitScaleData aExplicitScale; chart2::ExplicitIncrementData aExplicitIncrement; - + switch( eScaleProperty ) { case SCALE_PROP_MAX: @@ -347,7 +347,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const } break; } - + case SCALE_PROP_STEPMAIN: { aRet = aScaleData.IncrementData.Distance; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 4d29bc009777..5f8b8fb6d0aa 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -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 @@ -80,7 +80,7 @@ protected: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; tScaleProperty m_eScaleProperty; - + mutable ::com::sun::star::uno::Any m_aOuterValue; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 5e11a3012cf3..5e08685d707b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -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 @@ -77,7 +77,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") ); - + if( xInnerPropertySet.is() ) { bool bNewValue = false; @@ -108,7 +108,7 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") ); - + Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index 0094e30f7def..734a365856ac 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 68d408ea7147..27ded24a1458 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -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 @@ -85,12 +85,12 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue ::basegfx::B3DHomMatrix aNewMatrix = aMatrix*aObjectMatrix; aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix); - + WrappedProperty::setPropertyValue( uno::makeAny(aHM), xInnerPropertySet ); return; } } - + WrappedProperty::setPropertyValue( rOuterValue, xInnerPropertySet ); } @@ -105,7 +105,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: { ::basegfx::B3DTuple aRotation( BaseGFXHelper::GetRotationFromMatrix( BaseGFXHelper::HomogenMatrixToB3DHomMatrix( aHM ) ) ); - + ::basegfx::B3DHomMatrix aMatrix; aMatrix.rotate( aRotation.getX(), aRotation.getY(), aRotation.getZ() ); ::basegfx::B3DHomMatrix aObjectMatrix; @@ -116,7 +116,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: return uno::makeAny(aHM); } } - + return WrappedProperty::getPropertyValue( xInnerPropertySet ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 23a186de6406..a166b5083990 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -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 @@ -57,7 +57,7 @@ public: class WrappedD3DTransformMatrixProperty : public WrappedProperty { public: - WrappedD3DTransformMatrixProperty( + WrappedD3DTransformMatrixProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedD3DTransformMatrixProperty(); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index 6124e2baf506..fa92e640cd0b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index 6045802f4a5d..9884482055b7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 02ab979163bb..a079cc3316b2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 16ddb1137d4a..a7f0fe578cbd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -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 @@ -268,14 +268,14 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue rOuterValue >>= nOuterValue; chart2::CurveStyle aInnerValue; - + if(1==nOuterValue) aInnerValue = chart2::CurveStyle_CUBIC_SPLINES; else if(2==nOuterValue) aInnerValue = chart2::CurveStyle_B_SPLINES; else aInnerValue = chart2::CurveStyle_LINES; - + return uno::makeAny(aInnerValue); } //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 877d9cbe9a51..5687439cb7c9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 1c7b495bd566..ae27c41dfa8a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -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 @@ -884,7 +884,7 @@ WrappedRegressionCurvesProperty::~WrappedRegressionCurvesProperty() uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY ); if( xRegCnt.is() ) { - aRet = lcl_getRegressionCurveType( + aRet = lcl_getRegressionCurveType( RegressionCurveHelper::getFirstRegressTypeNotMeanValueLine( xRegCnt ) ); } return aRet; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index 973f0fef8ec8..6571d737e3d0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 3ecb23ce84d2..5494b1783628 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -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 @@ -108,7 +108,7 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( xDiagram, xFactory ); - uno::Reference< chart2::XChartTypeTemplate > xTemplate = + uno::Reference< chart2::XChartTypeTemplate > xTemplate = getNewTemplate( bNewValue, aTemplateAndService.second, xFactory ); if(xTemplate.is()) @@ -191,7 +191,7 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla if(!xFactory.is()) return xTemplate; - + if( bNewValue ) //add volume { if( rCurrentTemplate.equals( C2U( "com.sun.star.chart2.template.StockLowHighClose" ) ) ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index 3693b521b7dc..71d15b4c92bc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 4ca8f7161f6e..3d6f9fc37b9b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 5a175623e441..b163415e90a8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index a5d5afe6debc..efd6da8133c3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -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/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index ba0bf8919919..46847b8be56d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -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/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 6349a121ff28..8ccc2cf6a1fa 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.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 diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index 3945090217e0..11f9d3879662 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.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 diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc index 16bffd0cf86d..232dc4a82a04 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc +++ b/chart2/source/controller/dialogs/Bitmaps_HC.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 diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src index 738c133483e1..8c48d703b808 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.src +++ b/chart2/source/controller/dialogs/Bitmaps_HC.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 diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx index 22886c9b6108..a9102fb1922d 100644 --- a/chart2/source/controller/dialogs/ChangingResource.cxx +++ b/chart2/source/controller/dialogs/ChangingResource.cxx @@ -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/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index ed6be33b912e..86b8ec3f4525 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -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 @@ -52,7 +52,7 @@ public: virtual ~ChangingResource(); virtual void setChangeListener( ResourceChangeListener* pListener ); - + protected: ResourceChangeListener* m_pChangeListener; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 5e8bd7336b86..bc4e784b7d12 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -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 @@ -181,7 +181,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( //not all templates need to support CurveStyle, CurveResolution or SplineOrder ex.Context.is();//to have debug information without compilation warnings } - + try { xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D; @@ -453,7 +453,7 @@ ColumnChartDialogController::~ColumnChartDialogController() } String ColumnChartDialogController::getName() { - return String( SchResId( STR_TYPE_COLUMN )); + return String( SchResId( STR_TYPE_COLUMN )); } Image ColumnChartDialogController::getImage( bool bIsHighContrast ) { @@ -530,7 +530,7 @@ BarChartDialogController::~BarChartDialogController() } String BarChartDialogController::getName() { - return String( SchResId( STR_TYPE_BAR )); + return String( SchResId( STR_TYPE_BAR )); } Image BarChartDialogController::getImage( bool bIsHighContrast ) { @@ -668,7 +668,7 @@ LineChartDialogController::~LineChartDialogController() } String LineChartDialogController::getName() { - return String( SchResId( STR_TYPE_LINE )); + return String( SchResId( STR_TYPE_LINE )); } Image LineChartDialogController::getImage( bool bIsHighContrast ) { @@ -736,7 +736,7 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) ); } } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -780,7 +780,7 @@ void LineChartDialogController::adjustParameterToSubType( ChartTypeParameter& rP rParameter.bLines = false; break; } - + if(!rParameter.b3DLook && rParameter.eStackMode == GlobalStackMode_STACK_Z ) rParameter.eStackMode = GlobalStackMode_NONE; } @@ -801,7 +801,7 @@ XYChartDialogController::~XYChartDialogController() } String XYChartDialogController::getName() { - return String( SchResId( STR_TYPE_XY )); + return String( SchResId( STR_TYPE_XY )); } Image XYChartDialogController::getImage( bool bIsHighContrast ) { @@ -838,7 +838,7 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsH rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) ); rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -888,7 +888,7 @@ AreaChartDialogController::~AreaChartDialogController() } String AreaChartDialogController::getName() { - return String( SchResId( STR_TYPE_AREA )); + return String( SchResId( STR_TYPE_AREA )); } Image AreaChartDialogController::getImage( bool bIsHighContrast ) { @@ -927,7 +927,7 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) ); rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); @@ -971,7 +971,7 @@ NetChartDialogController::~NetChartDialogController() } String NetChartDialogController::getName() { - return String( SchResId( STR_TYPE_NET )); + return String( SchResId( STR_TYPE_NET )); } Image NetChartDialogController::getImage( bool bIsHighContrast ) { @@ -1007,7 +1007,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); - + if( GlobalStackMode_NONE == rParameter.eStackMode ) { rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) ); @@ -1064,7 +1064,7 @@ StockChartDialogController::~StockChartDialogController() } String StockChartDialogController::getName() { - return String( SchResId( STR_TYPE_STOCK )); + return String( SchResId( STR_TYPE_STOCK )); } Image StockChartDialogController::getImage( bool bIsHighContrast ) { @@ -1115,7 +1115,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() } String CombiColumnLineChartDialogController::getName() { - return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); + return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast ) { @@ -1170,7 +1170,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c m_pFT_NumberOfLines->SetPosPixel( Point( rPosition.X(), rPosition.Y()+aDistanceSize.Height()) ); m_pMF_NumberOfLines->SetPosPixel( Point( rPosition.X()+aFTSize.Width()+aDistanceSize.Width(), rPosition.Y()) ); - + m_pFT_NumberOfLines->Show(); m_pMF_NumberOfLines->Show(); } @@ -1255,7 +1255,7 @@ BubbleChartDialogController::~BubbleChartDialogController() } String BubbleChartDialogController::getName() { - return String( SchResId( STR_TYPE_BUBBLE )); + return String( SchResId( STR_TYPE_BUBBLE )); } Image BubbleChartDialogController::getImage( bool bIsHighContrast ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 56ffb93e4a60..d89518baf0ea 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -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 @@ -68,7 +68,7 @@ class ChartTypeParameter public: ChartTypeParameter( sal_Int32 nSubTypeIndex, bool bXAxisWithValues=false , bool b3DLook=false, GlobalStackMode eStackMode=GlobalStackMode_NONE - , bool _bSymbols = true, bool _bLines = true + , bool _bSymbols = true, bool _bLines = true , ::com::sun::star::chart2::CurveStyle eCurveStyle = ::com::sun::star::chart2::CurveStyle_LINES ); ChartTypeParameter(); virtual ~ChartTypeParameter(); @@ -82,7 +82,7 @@ public: bool b3DLook; bool bSymbols; bool bLines; - + GlobalStackMode eStackMode; ::com::sun::star::chart2::CurveStyle eCurveStyle; @@ -102,7 +102,7 @@ class ChartTypeDialogController : public ChangingResource public: ChartTypeDialogController(); virtual ~ChartTypeDialogController(); - + virtual String getName()=0; virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; @@ -122,7 +122,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - + virtual bool isSubType( const rtl::OUString& rServiceName ); virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); @@ -146,10 +146,10 @@ class ColumnOrBarChartDialogController_Base : public ChartTypeDialogController public: ColumnOrBarChartDialogController_Base(); virtual ~ColumnOrBarChartDialogController_Base(); - + virtual bool shouldShow_3DLookControl() const; virtual bool shouldShow_GeometryControl() const; - + virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter ); }; @@ -158,7 +158,7 @@ class ColumnChartDialogController : public ColumnOrBarChartDialogController_Base public: ColumnChartDialogController(); virtual ~ColumnChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -170,7 +170,7 @@ class BarChartDialogController : public ColumnOrBarChartDialogController_Base public: BarChartDialogController(); virtual ~BarChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -182,7 +182,7 @@ class PieChartDialogController : public ChartTypeDialogController public: PieChartDialogController(); virtual ~PieChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -197,14 +197,14 @@ class LineChartDialogController : public ChartTypeDialogController public: LineChartDialogController(); virtual ~LineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; virtual bool shouldShow_DeepStackingControl() const; virtual bool shouldShow_SplineControl() const; @@ -215,13 +215,13 @@ class XYChartDialogController : public ChartTypeDialogController public: XYChartDialogController(); virtual ~XYChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_SplineControl() const; virtual bool shouldShow_SortByXValuesResourceGroup() const; }; @@ -231,14 +231,14 @@ class AreaChartDialogController : public ChartTypeDialogController public: AreaChartDialogController(); virtual ~AreaChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_3DLookControl() const; }; @@ -247,13 +247,13 @@ class NetChartDialogController : public ChartTypeDialogController public: NetChartDialogController(); virtual ~NetChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; }; @@ -262,7 +262,7 @@ class StockChartDialogController : public ChartTypeDialogController public: StockChartDialogController(); virtual ~StockChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -275,7 +275,7 @@ class CombiColumnLineChartDialogController : public ChartTypeDialogController public: CombiColumnLineChartDialogController(); virtual ~CombiColumnLineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -287,10 +287,10 @@ public: virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; - + virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); -private: +private: DECL_LINK( ChangeLineCountHdl, void* ); private: @@ -303,7 +303,7 @@ class BubbleChartDialogController : public ChartTypeDialogController public: BubbleChartDialogController(); virtual ~BubbleChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx index b2790a1678bb..fd9b9fcd83de 100644 --- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx +++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx @@ -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/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc index 8a3ae8f9f63c..d594420464c1 100644 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ b/chart2/source/controller/dialogs/CommonResources.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 diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 67930fc6f7a7..da92f145af61 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -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 @@ -1221,7 +1221,7 @@ void DataBrowser::ColumnResized( USHORT nColId ) SetUpdateMode( bLastUpdateMode ); } -// virtual void MouseMove( const MouseEvent& rEvt ); +// virtual void MouseMove( const MouseEvent& rEvt ); void DataBrowser::EndScroll() { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3583db2770c0..8ba66d264e8d 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -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 @@ -79,14 +79,14 @@ public: virtual ~DataBrowser(); /** GetCellText returns the text at the given position - @param nRow + @param nRow the number of the row - @param nColId + @param nColId the ID of the column @return the text out of the cell */ - virtual String GetCellText(long nRow, USHORT nColId) const; + virtual String GetCellText(long nRow, USHORT nColId) const; /** returns the number in the given cell. If a cell is empty or contains a string, the result will be Nan @@ -182,7 +182,7 @@ private: /// note: m_aTextEditField must precede this member! ::svt::CellControllerRef m_rTextEditController; - Link m_aCursorMovedHdlLink; + Link m_aCursorMovedHdlLink; Link m_aCellModifiedLink; void clearHeaders(); @@ -201,4 +201,4 @@ private: } // namespace chart -#endif // CHART_DATA_BROWSER_HXX +#endif // CHART_DATA_BROWSER_HXX diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index c0b865536686..1440210ce0c6 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -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 @@ -869,7 +869,7 @@ void DataBrowserModel::updateFromModel() } else if( aRole.equals( C2U( "values-x" ) ) ) nSequenceNumberFormatKey = nXAxisNumberFormat; - + if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end()) { diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index a4378972f70f..2331cd023683 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -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/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index f32a882aa1e9..83a22eedb5c9 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -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/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index dcca6c716b8d..05263d70aead 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -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/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 0836ab9ca93a..d6ee1ce3ff0e 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -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 @@ -197,7 +197,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal , C2U("%CATEGORYVALUE") , ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex ) ); - + aRet = aCategory; } else @@ -338,7 +338,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID { rtl::OUString aRet; - + Reference< XAxis > xAxis( ObjectIdentifier::getObjectPropertySet( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -347,7 +347,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID sal_Int32 nDimensionIndex = 0; sal_Int32 nAxisIndex = 0; AxisHelper::getIndicesForAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ), nCooSysIndex, nDimensionIndex, nAxisIndex ); - + switch(nDimensionIndex) { case 0://x-axis @@ -369,7 +369,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID aRet=String(SchResId(STR_OBJECT_AXIS)); break; } - + return aRet; } @@ -405,7 +405,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) DBG_ERROR("unknown title type"); break; } - + if( !aRet.getLength() ) aRet=String(SchResId(STR_OBJECT_TITLE)); @@ -437,7 +437,7 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { rtl::OUString aRet; - + sal_Int32 nCooSysIndex = -1; sal_Int32 nDimensionIndex = -1; @@ -558,7 +558,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, break; } } - + OUString aReplacement( OUString::valueOf(nSeriesIndex+1) ); aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement ); } diff --git a/chart2/source/controller/dialogs/RangeEdit.cxx b/chart2/source/controller/dialogs/RangeEdit.cxx index 55888156b1b1..733f066a7584 100644 --- a/chart2/source/controller/dialogs/RangeEdit.cxx +++ b/chart2/source/controller/dialogs/RangeEdit.cxx @@ -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/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 9b94d7e1752b..a8575dfb6233 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -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/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index ccb4979420d1..ccc6468f0b0b 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -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/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index a2bb0b7602d6..025782cf4603 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -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/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 2ab544c77ab1..4e6f01595b61 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.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 @@ -60,8 +60,8 @@ #define TP_LAYOUT 907 #define TP_OPTIONS 908 #define TP_POLAROPTIONS 909 -#define TP_AXIS_LABEL 920 -#define TP_SCALE 903 +#define TP_AXIS_LABEL 920 +#define TP_SCALE 903 #define TP_AXIS_POSITIONS 904 #define TP_CHARTTYPE 910 #define TP_RANGECHOOSER 911 diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b4cec65426e..6b684d023eed 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.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 @@ -123,7 +123,7 @@ String STR_PAGE_POSITIONING // String STR_PAGE_STATISTICS // { -// Text [ en-US ] = "Statistics" ; +// Text [ en-US ] = "Statistics" ; // }; String STR_PAGE_TRENDLINE_TYPE diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src index f233ddaa7c20..bc658def2a0c 100644 --- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src +++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.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 diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src index 6c7fc5a752aa..d06612a5afb8 100644 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ b/chart2/source/controller/dialogs/Strings_ChartTypes.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 diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src index e7a3d6c2b1cf..9185552cb90a 100644 --- a/chart2/source/controller/dialogs/Strings_Scale.src +++ b/chart2/source/controller/dialogs/Strings_Scale.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 diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src index f2dc4235f783..7fdd1642ef4e 100644 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ b/chart2/source/controller/dialogs/Strings_Statistic.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 diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 1f445083738f..342495738ce5 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.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 @@ -52,13 +52,13 @@ //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES // ID's for title rotation tabpage -#define CTR_DIAL 6030 -#define BTN_TXTSTACKED 6031 -#define FT_DEGREES 6032 -#define NF_ORIENT 6033 -#define CTR_DUMMY 6034 -#define FT_DUMMY 6035 -#define FL_ALIGN 6037 +#define CTR_DIAL 6030 +#define BTN_TXTSTACKED 6031 +#define FT_DEGREES 6032 +#define NF_ORIENT 6033 +#define CTR_DUMMY 6034 +#define FT_DUMMY 6035 +#define FL_ALIGN 6037 #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 @@ -82,59 +82,59 @@ //------------ //from old chart tplabel.hrc -//#define TP_AXIS_LABEL 920 +//#define TP_AXIS_LABEL 920 -#define CB_AXIS_LABEL_SCHOW_DESCR 1 +#define CB_AXIS_LABEL_SCHOW_DESCR 1 -//#define FL_AXIS_LABEL_FORMATTING 2 +//#define FL_AXIS_LABEL_FORMATTING 2 -#define FL_AXIS_LABEL_ORIENTATION 3 -#define CT_AXIS_LABEL_DIAL 4 -#define PB_AXIS_LABEL_TEXTSTACKED 5 -#define FT_AXIS_LABEL_DEGREES 6 -#define NF_AXIS_LABEL_ORIENT 7 -#define FT_UNUSED 8 -#define CT_UNUSED 9 +#define FL_AXIS_LABEL_ORIENTATION 3 +#define CT_AXIS_LABEL_DIAL 4 +#define PB_AXIS_LABEL_TEXTSTACKED 5 +#define FT_AXIS_LABEL_DEGREES 6 +#define NF_AXIS_LABEL_ORIENT 7 +#define FT_UNUSED 8 +#define CT_UNUSED 9 -#define FL_AXIS_LABEL_TEXTFLOW 10 -#define CB_AXIS_LABEL_TEXTOVERLAP 11 -#define CB_AXIS_LABEL_TEXTBREAK 12 +#define FL_AXIS_LABEL_TEXTFLOW 10 +#define CB_AXIS_LABEL_TEXTOVERLAP 11 +#define CB_AXIS_LABEL_TEXTBREAK 12 -#define FL_AXIS_LABEL_ORDER 13 -#define RB_AXIS_LABEL_SIDEBYSIDE 14 -#define RB_AXIS_LABEL_UPDOWN 15 -#define RB_AXIS_LABEL_DOWNUP 16 -#define RB_AXIS_LABEL_AUTOORDER 17 +#define FL_AXIS_LABEL_ORDER 13 +#define RB_AXIS_LABEL_SIDEBYSIDE 14 +#define RB_AXIS_LABEL_UPDOWN 15 +#define RB_AXIS_LABEL_DOWNUP 16 +#define RB_AXIS_LABEL_AUTOORDER 17 -#define FL_SEPARATOR 18 +#define FL_SEPARATOR 18 #define FT_AXIS_TEXTDIR 19 #define LB_AXIS_TEXTDIR 20 -//#define TP_SCALE 903 +//#define TP_SCALE 903 -#define FL_SCALE 1 +#define FL_SCALE 1 -#define TXT_MIN 1 -#define TXT_MAX 2 -#define TXT_STEP_MAIN 3 -#define TXT_STEP_HELP 4 -#define TXT_ORIGIN 5 +#define TXT_MIN 1 +#define TXT_MAX 2 +#define TXT_STEP_MAIN 3 +#define TXT_STEP_HELP 4 +#define TXT_ORIGIN 5 -#define CBX_AUTO_MIN 1 -#define CBX_AUTO_MAX 2 -#define CBX_AUTO_STEP_MAIN 3 -#define CBX_AUTO_STEP_HELP 4 -#define CBX_AUTO_ORIGIN 5 -#define CBX_LOGARITHM 6 +#define CBX_AUTO_MIN 1 +#define CBX_AUTO_MAX 2 +#define CBX_AUTO_STEP_MAIN 3 +#define CBX_AUTO_STEP_HELP 4 +#define CBX_AUTO_ORIGIN 5 +#define CBX_LOGARITHM 6 #define CBX_REVERSE 7 -#define EDT_STEP_MAIN 1 -#define EDT_MAX 2 -#define EDT_MIN 3 +#define EDT_STEP_MAIN 1 +#define EDT_MAX 2 +#define EDT_MIN 3 #define EDT_ORIGIN 4 -#define MT_STEPHELP 10 +#define MT_STEPHELP 10 //#define TP_AXIS_POSITIONS 904 @@ -145,24 +145,24 @@ #define FL_GRIDS 5 #define FT_CROSSES_OTHER_AXIS_AT 1 -#define FT_AXIS_LABEL_DISTANCE 2 -#define FT_PLACE_LABELS 3 -#define FT_MAJOR 4 -#define FT_MINOR 5 +#define FT_AXIS_LABEL_DISTANCE 2 +#define FT_PLACE_LABELS 3 +#define FT_MAJOR 4 +#define FT_MINOR 5 #define FT_PLACE_TICKS 6 #define LB_CROSSES_OTHER_AXIS_AT 1 #define LB_PLACE_LABELS 2 #define EDT_CROSSES_OTHER_AXIS_AT 3 #define EDT_CROSSES_OTHER_AXIS_AT_CATEGORY 4 -#define EDT_AXIS_LABEL_DISTANCE 5 +#define EDT_AXIS_LABEL_DISTANCE 5 #define LB_PLACE_TICKS 6 #define CB_AXIS_BETWEEN_CATEGORIES 1 -#define CB_TICKS_INNER 2 -#define CB_TICKS_OUTER 3 -#define CB_MINOR_INNER 4 -#define CB_MINOR_OUTER 5 +#define CB_TICKS_INNER 2 +#define CB_TICKS_OUTER 3 +#define CB_MINOR_INNER 4 +#define CB_MINOR_OUTER 5 #define CB_MAJOR_GRID 6 #define CB_MINOR_GRID 7 diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 23a1b4e806bd..379cf9257ab0 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -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/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index f1af209697cc..a5a8df15e565 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -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/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 8846b310cde4..d9da20f77ec2 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -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/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index f446c52ac0de..192e9652d2da 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -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 @@ -61,7 +61,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent FreeResource(); this->SetText(String(SchResId(STR_PAGE_CHARTTYPE))); - + //don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); m_pChartTypeTabPage->initializePage(); diff --git a/chart2/source/controller/dialogs/dlg_ChartType.hrc b/chart2/source/controller/dialogs/dlg_ChartType.hrc index 0b5c20dae05c..940290bbba8f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.hrc +++ b/chart2/source/controller/dialogs/dlg_ChartType.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 diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src index 5523ad8956db..07a2627be6b2 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.src +++ b/chart2/source/controller/dialogs/dlg_ChartType.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 @@ -39,19 +39,19 @@ ModalDialog DLG_DIAGRAM_TYPE { HelpID = SID_DIAGRAM_TYPE ; - + Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_BUTTONS { Pos = MAP_APPFONT ( 0 , CHART_TYPE_DLG_HEIGHT-24 ) ; Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , 8 ) ; }; - + BUTTONS_OK_CANCEL_HELP( CHART_TYPE_DLG_WIDTH-161 ,CHART_TYPE_DLG_HEIGHT-17 , 53, 0 ) }; diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index aa9db2cdbbe4..b97ec2976a7a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -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 @@ -109,7 +109,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) ChartTypeUnoDlg_BASE::implInitialize(_rValue); } //------------------------------------------------------------------------------ -Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) +Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext.getUNOContext() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 5b82e57f7044..ecc78aca5812 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -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/chart2/source/controller/dialogs/dlg_CreationWizard.hrc b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc index 48fa33484be8..d561215e2022 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.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 diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.src b/chart2/source/controller/dialogs/dlg_CreationWizard.src index 90fe0e2993ed..ca25f67926b6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.src +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.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 diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index f9c25f94f7f3..49f062a26bc6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -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/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index f1d441921a6a..d63928e37c07 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -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/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc index d2675c5bb29e..c8c0536ae72a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc +++ b/chart2/source/controller/dialogs/dlg_DataEditor.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 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src index dadd1ac3098d..002ff099fa2a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.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 diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 9469293ae1c5..a970a2464278 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -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/chart2/source/controller/dialogs/dlg_DataSource.hrc b/chart2/source/controller/dialogs/dlg_DataSource.hrc index b8c5ff96bb33..fa9cd515e65d 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.hrc +++ b/chart2/source/controller/dialogs/dlg_DataSource.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 diff --git a/chart2/source/controller/dialogs/dlg_DataSource.src b/chart2/source/controller/dialogs/dlg_DataSource.src index 08427a4e271b..890e0c76f1ab 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.src +++ b/chart2/source/controller/dialogs/dlg_DataSource.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index e97f15898064..9465103e15f0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -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 @@ -110,7 +110,7 @@ SchAxisDlg::SchAxisDlg( Window* pWindow //todo: remove if secondary z axis are possible somewhere { aCbSecondaryZ.Hide(); - + Size aSize( GetSizePixel() ); //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height(); aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() ); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc index d069e893116c..5a3d3673b84a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..2d93de1ee567 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.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 @@ -56,7 +56,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_X_PRIMARY { HelpID = HID_SCH_CB_XAXIS; - + Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -65,7 +65,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Y_PRIMARY { HelpID = HID_SCH_CB_YAXIS; - + Pos = MAP_APPFONT ( 12 , 28 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -74,7 +74,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Z_PRIMARY { HelpID = HID_SCH_CB_ZAXIS; - + Pos = MAP_APPFONT ( 12 , 42 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 2105b0bb2c87..bfe957e35acb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -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/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc b/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc index 92f67309d6fc..1b78ca8ff0ef 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src index 8f8a64485778..a34dacde7909 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 9c4438b6f1ca..2182a79a241f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -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/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc b/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..8cf0f6b35452 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.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 @@ -33,7 +33,7 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; +// HelpID = SID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index e722ede09c5a..aea8023fb7b4 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -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/chart2/source/controller/dialogs/dlg_InsertLegend.hrc b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 95a1d5516ab5..4ee97fb3df26 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index bd98774c57a8..7f6910d8902c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -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/chart2/source/controller/dialogs/dlg_InsertTitle.hrc b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc index fc46db129b5b..4dec735d8e2c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.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 @@ -25,7 +25,7 @@ * ************************************************************************/ #include "ResourceIds.hrc" - + #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src index f84ff2c6acd7..10a1bfb696c0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx index 58b29b4bdfe3..6dde52bb1ff1 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx @@ -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/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..56b4697ddc1f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.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 diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index bf0dedfbc6e8..a3adf3d8eb44 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -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 @@ -70,7 +70,7 @@ NumberFormatDialog::~NumberFormatDialog() //static SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ) { - static const USHORT nWhichPairs[] = + static const USHORT nWhichPairs[] = { SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 96cfb23c1f95..ffa04bf6407f 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -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/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 2a41d35313e8..9a0e42950f1c 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -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 @@ -418,7 +418,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); if( aCJKOptions.IsAsianTypographyEnabled() ) AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); - + break; case OBJECTTYPE_AXIS: diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.src b/chart2/source/controller/dialogs/dlg_ObjectProperties.src index 9eae934ce6df..5b0dfa19265f 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.src +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index 280a1adecba2..dfae2910be87 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -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/chart2/source/controller/dialogs/dlg_ShapeFont.src b/chart2/source/controller/dialogs/dlg_ShapeFont.src index 2065bd940988..92466c496083 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.src +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 2f0173fc8408..ea464743ba7a 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -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/chart2/source/controller/dialogs/dlg_ShapeParagraph.src b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src index ff74fc1eef80..be50398dd6fe 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.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 diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 26a726ac5156..590fa36c7d47 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -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/chart2/source/controller/dialogs/dlg_View3D.hrc b/chart2/source/controller/dialogs/dlg_View3D.hrc index 59564a97b8b8..197a4052113c 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.hrc +++ b/chart2/source/controller/dialogs/dlg_View3D.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 diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..4c7177b1d7af 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.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 @@ -42,7 +42,7 @@ TabDialog DLG_3D_VIEW OutputSize = TRUE ; Pos = MAP_APPFONT ( 3 , 3 ) ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - }; + }; BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3) }; diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src index 4b006f0f1f93..657c25a8abf2 100644 --- a/chart2/source/controller/dialogs/hidother.src +++ b/chart2/source/controller/dialogs/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 diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index f2c31fe461a9..5a08244064b4 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -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 @@ -65,11 +65,11 @@ Size BarGeometryResources::GetSizePixel() const long nHeight = m_aLB_Geometry.GetPosPixel().Y() - m_aFT_Geometry.GetPosPixel().Y(); nHeight += m_aLB_Geometry.GetSizePixel().Height(); - + long nWidth = m_aLB_Geometry.GetSizePixel().Width(); if( nWidth < m_aFT_Geometry.GetSizePixel().Width() ) nWidth = m_aFT_Geometry.GetSizePixel().Width(); - + return Size( nHeight, nWidth ); } BarGeometryResources::~BarGeometryResources() diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index db2f71e2f178..e5135e6277dd 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -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/chart2/source/controller/dialogs/res_BarGeometry.src b/chart2/source/controller/dialogs/res_BarGeometry.src index ea481070132d..bda633eddfe2 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.src +++ b/chart2/source/controller/dialogs/res_BarGeometry.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 diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 25d279eaad37..b98172979962 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -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 @@ -184,14 +184,14 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt aCBSize.setWidth(nCBXWidth); m_aCBNumber.SetSizePixel( aCBSize ); m_aCBPercent.SetSizePixel( aCBSize ); - + //place and align separator and label placement listboxes Size aSize( m_aFT_LabelPlacement.GetSizePixel() ); aSize.setWidth( m_aFT_LabelPlacement.CalcMinimumSize().getWidth() ); m_aFT_LabelPlacement.SetSizePixel(aSize); long nWantedMinLeftBorder = m_aFT_LabelPlacement.GetPosPixel().X() + aSize.getWidth () + aControlDistance.Width(); - + m_aSeparatorResources.PositionBelowControl(m_aCBSymbol); m_aSeparatorResources.AlignListBoxWidthAndXPos( nWantedMinLeftBorder, -1, m_aLB_LabelPlacement.CalcMinimumSize().getWidth() ); m_aSeparatorResources.Show(true); diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index ef34e004bb07..f15025d72627 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -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/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc b/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc index 5251841a2d9b..d70cc8bd2526 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_IDs.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 diff --git a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc b/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc index 9501368f537e..72349a5cad47 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_tmpl.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 @@ -57,7 +57,7 @@ CheckBox CB_VALUE_AS_NUMBER \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~number" ; \ -}; \ +}; \ PushButton PB_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_NUMBERFORMAT; \ @@ -73,7 +73,7 @@ CheckBox CB_VALUE_AS_PERCENTAGE \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~percentage" ; \ -}; \ +}; \ PushButton PB_PERCENT_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_PERCENT_NUMBERFORMAT; \ diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 8b649072538e..7a1c337d21eb 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -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/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc index bab1051208f4..7205f225ec5b 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_IDs.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 diff --git a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc index 0f4cf70e30c7..db22d24fe5fd 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.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 @@ -35,7 +35,7 @@ StringList [ en-US ] = \ < "Standard Deviation" ; CHART_LB_FUNCTION_STD_DEV ; >; \ < "Variance" ; CHART_LB_FUNCTION_VARIANCE ; >; \ < "Error Margin" ; CHART_LB_FUNCTION_ERROR_MARGIN ; >; \ - }; + }; #define RESOURCE_ERRORBARS(availablewidth, yoffset) \ diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index c9206a5428df..19292ecaaf09 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -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 @@ -86,7 +86,7 @@ void LegendPositionResources::impl_setRadioButtonToggleHdl() m_aRbtLeft.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtTop.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtRight.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); - m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); + m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); } LegendPositionResources::~LegendPositionResources() @@ -156,7 +156,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen if( m_aRbtLeft.IsChecked() ) eNewPos = chart2::LegendPosition_LINE_START; else if( m_aRbtRight.IsChecked() ) - { + { eNewPos = chart2::LegendPosition_LINE_END; } else if( m_aRbtTop.IsChecked() ) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index ee0ac5a7601c..d2c0b155df46 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -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 @@ -75,10 +75,10 @@ private: CheckBox m_aCbxShow; - RadioButton m_aRbtLeft; - RadioButton m_aRbtTop; - RadioButton m_aRbtRight; - RadioButton m_aRbtBottom; + RadioButton m_aRbtLeft; + RadioButton m_aRbtTop; + RadioButton m_aRbtRight; + RadioButton m_aRbtBottom; Link m_aChangeLink; }; diff --git a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc b/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc index 4dd46e0c9df7..6cf0893b0736 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_IDs.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 diff --git a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc index 17f6518eabe4..48867d3012d2 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.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 diff --git a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc index 7e9609e20763..2eed1dc570f5 100644 --- a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.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 diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 45efd2f5e5b3..45b57a66318a 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -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/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx index 4895a442fa0b..949fa87ea5df 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.hxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx @@ -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/chart2/source/controller/dialogs/res_TextSeparator.src b/chart2/source/controller/dialogs/res_TextSeparator.src index c0b95ea23c7d..d4b1b5e0c9fa 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.src +++ b/chart2/source/controller/dialogs/res_TextSeparator.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 @@ -38,7 +38,7 @@ ListBox LB_TEXT_SEPARATOR Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Space" ; diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 225c8fe8748b..fbbdd80f7cc9 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -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 @@ -69,11 +69,11 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryXAxis.CalcMinimumSize().Width() ) ; nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryYAxis.CalcMinimumSize().Width() ) ; } - + Size aControlDistance( m_aFT_Main.LogicToPixel( Size(RSC_SP_CTRL_DESC_X,RSC_SP_CTRL_GROUP_Y), MapMode(MAP_APPFONT) ) ); long nEditFieldXPos = m_aFT_Main.GetPosPixel().X() + nMaxTextWidth + aControlDistance.Width(); long nEditFieldWidth = m_aEd_Main.GetPosPixel().X() + m_aEd_Main.GetSizePixel().Width() - nEditFieldXPos; - + if( nEditFieldWidth > 10 ) { Size aFTSize( m_aFT_Main.GetSizePixel() ); @@ -88,7 +88,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aFT_SecondaryXAxis.SetSizePixel(aFTSize); m_aFT_SecondaryYAxis.SetSizePixel(aFTSize); } - + m_aEd_Main.SetPosPixel( Point( nEditFieldXPos, m_aEd_Main.GetPosPixel().Y() ) ); m_aEd_Sub.SetPosPixel( Point( nEditFieldXPos, m_aEd_Sub.GetPosPixel().Y() ) ); m_aEd_XAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_XAxis.GetPosPixel().Y() ) ); @@ -99,7 +99,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryXAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryXAxis.GetPosPixel().Y() ) ); m_aEd_SecondaryYAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryYAxis.GetPosPixel().Y() ) ); } - + Size aEditSize( m_aEd_Main.GetSizePixel() ); aEditSize.Width() = nEditFieldWidth; m_aEd_Main.SetSizePixel( aEditSize ); @@ -113,7 +113,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryYAxis.SetSizePixel( aEditSize ); } } - + m_aFT_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aEd_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aFT_SecondaryYAxis.Show( bShowSecondaryAxesTitle ); diff --git a/chart2/source/controller/dialogs/res_Titles.hrc b/chart2/source/controller/dialogs/res_Titles.hrc index c66aac02014c..b364fdbe38bd 100644 --- a/chart2/source/controller/dialogs/res_Titles.hrc +++ b/chart2/source/controller/dialogs/res_Titles.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 diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx index c79550dd7be1..d3f9b7fd38b6 100644 --- a/chart2/source/controller/dialogs/res_Titles.hxx +++ b/chart2/source/controller/dialogs/res_Titles.hxx @@ -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 @@ -50,18 +50,18 @@ public: void ClearModifyFlag(); private: - FixedText m_aFT_Main; - Edit m_aEd_Main; - FixedText m_aFT_Sub; - Edit m_aEd_Sub; + FixedText m_aFT_Main; + Edit m_aEd_Main; + FixedText m_aFT_Sub; + Edit m_aEd_Sub; FixedLine m_aFL_Axes; - FixedText m_aFT_XAxis; - Edit m_aEd_XAxis; - FixedText m_aFT_YAxis; - Edit m_aEd_YAxis; - FixedText m_aFT_ZAxis; - Edit m_aEd_ZAxis; + FixedText m_aFT_XAxis; + Edit m_aEd_XAxis; + FixedText m_aFT_YAxis; + Edit m_aEd_YAxis; + FixedText m_aFT_ZAxis; + Edit m_aEd_ZAxis; FixedLine m_aFL_SecondaryAxes; FixedText m_aFT_SecondaryXAxis; diff --git a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc index c64c71d78c21..4949baa1217c 100644 --- a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Titlesx_tmpl.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 diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index a395d32c2efa..deaad8266295 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -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/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 248a677edd21..76b891c108ad 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -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/chart2/source/controller/dialogs/res_Trendline_IDs.hrc b/chart2/source/controller/dialogs/res_Trendline_IDs.hrc index 0e857742af4e..f71786927156 100644 --- a/chart2/source/controller/dialogs/res_Trendline_IDs.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_IDs.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 diff --git a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc b/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc index 734384e200d8..311aa90a9516 100644 --- a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_tmpl.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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 6b3b63495126..f22e2c7dfd2b 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -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 @@ -105,13 +105,13 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( Window* pWindow , const uno::Reference< frame::XModel > & xChartModel , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) , m_xChartModel ( xChartModel ) , m_aFT_Scheme ( this, SchResId( FT_SCHEME ) ) , m_aLB_Scheme ( this, SchResId( LB_SCHEME ) ) , m_aFL_Seperator ( this, SchResId( FL_SEPERATOR ) ) , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) ) - , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) + , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) ) , m_bUpdateOtherControls( true ) , m_bCommitToModel( true ) @@ -345,14 +345,14 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check if( pCheckBox == &m_aCB_ObjectLines ) { m_aCB_ObjectLines.EnableTriState( FALSE ); - m_bUpdateOtherControls = false; + m_bUpdateOtherControls = false; m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() ); if(!m_aCB_RoundedEdge.IsEnabled()) m_aCB_RoundedEdge.Check(FALSE); m_bUpdateOtherControls = true; } else - m_aCB_RoundedEdge.EnableTriState( FALSE ); + m_aCB_RoundedEdge.EnableTriState( FALSE ); applyRoundedEdgeAndObjectLinesToModel(); updateScheme(); return 0; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc index e01be1c35072..47a761753581 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 252c5c21669b..f5b9d2d17f7e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -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 @@ -77,14 +77,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - FixedText m_aFT_Scheme; - ListBox m_aLB_Scheme; + FixedText m_aFT_Scheme; + ListBox m_aLB_Scheme; - FixedLine m_aFL_Seperator; + FixedLine m_aFL_Seperator; - CheckBox m_aCB_RoundedEdge; - CheckBox m_aCB_Shading; - CheckBox m_aCB_ObjectLines; + CheckBox m_aCB_RoundedEdge; + CheckBox m_aCB_Shading; + CheckBox m_aCB_ObjectLines; bool m_bUpdateOtherControls; bool m_bCommitToModel; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..2f8dad3bced8 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.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 @@ -38,7 +38,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_SCHEME 8 @@ -74,8 +74,8 @@ TabPage TP_3D_SCENEAPPEARANCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPERATOR ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ; - }; - + }; + CheckBox CB_SHADING { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 39175695a48b..06cec912108a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -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 @@ -73,14 +73,14 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit ) ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) , m_xSceneProperties( xSceneProperties ) , m_aCbxRightAngledAxes( this, SchResId( CBX_RIGHT_ANGLED_AXES ) ) - , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) - , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) - , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) - , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) - , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) + , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) + , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) + , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) + , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) + , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) , m_aMFZRotation ( this, SchResId( MTR_FLD_Z_ROTATION ) ) , m_aCbxPerspective ( this, SchResId( CBX_PERSPECTIVE ) ) , m_aMFPerspective ( this, SchResId( MTR_FLD_PERSPECTIVE ) ) @@ -151,7 +151,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow sal_Bool bRightAngledAxes = false; uno::Reference< chart2::XDiagram > xDiagram( m_xSceneProperties, uno::UNO_QUERY ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; @@ -251,7 +251,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG ) IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG ) { m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); - applyPerspectiveToModel(); + applyPerspectiveToModel(); return 0; } @@ -268,7 +268,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG m_nXRotation = m_aMFXRotation.GetValue(); m_nYRotation = m_aMFYRotation.GetValue(); m_nZRotation = m_aMFZRotation.GetValue(); - + m_aMFXRotation.SetValue(static_cast(ThreeDHelper::getValueClippedToRange(static_cast(m_nXRotation), ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes()))); m_aMFYRotation.SetValue(static_cast(ThreeDHelper::getValueClippedToRange(static_cast(m_nYRotation), ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes()))); m_aMFZRotation.SetEmptyFieldValue(); @@ -287,7 +287,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG } ThreeDHelper::switchRightAngledAxes( m_xSceneProperties, m_aCbxRightAngledAxes.IsChecked(), true /*bRotateLights*/ ); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc index e84bc84012e9..6b46d43efd11 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 95aeb7f6a02a..9208b519bb16 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -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 @@ -80,19 +80,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; - CheckBox m_aCbxRightAngledAxes; - - FixedText m_aFtXRotation; - MetricField m_aMFXRotation; - - FixedText m_aFtYRotation; - MetricField m_aMFYRotation; + CheckBox m_aCbxRightAngledAxes; - FixedText m_aFtZRotation; - MetricField m_aMFZRotation; + FixedText m_aFtXRotation; + MetricField m_aMFXRotation; + + FixedText m_aFtYRotation; + MetricField m_aMFYRotation; + + FixedText m_aFtZRotation; + MetricField m_aMFZRotation; - CheckBox m_aCbxPerspective; - MetricField m_aMFPerspective; + CheckBox m_aCbxPerspective; + MetricField m_aMFPerspective; //to keep old values when switching to right angled axes sal_Int64 m_nXRotation; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..54a4bcaf929c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.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 @@ -42,7 +42,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_0 (8) @@ -73,7 +73,7 @@ TabPage TP_3D_SCENEGEOMETRY SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + CheckBox CBX_RIGHT_ANGLED_AXES { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0 ) ; @@ -117,7 +117,7 @@ TabPage TP_3D_SCENEGEOMETRY Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; - + CheckBox CBX_PERSPECTIVE { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4 ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 25b379481b7e..2e8abdba2b3c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -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 @@ -289,7 +289,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel , XColorTable* pColorTable ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) , m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) ) , m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 ) , m_aBtn_Light2( this, SchResId( BTN_LIGHT_2 ), 2 ) @@ -333,7 +333,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin m_pLightSourceInfoList[7].pButton = &m_aBtn_Light8; fillControlsFromModel(0); - + m_aBtn_Light1.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light2.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light3.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); @@ -355,7 +355,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - + m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } @@ -452,7 +452,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const Svx3DLightDirection8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue()); applyLightSourcesToModel(); - + return 0; } @@ -464,7 +464,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG ) LightButton* pButton = m_pLightSourceInfoList[nLightNumber].pButton; if(!pButton->IsChecked()) ClickLightSourceButtonHdl(pButton); - + applyLightSourcesToModel(); } return 0; @@ -594,37 +594,37 @@ void ThreeD_SceneIllumination_TabPage::updatePreview() aItemSet.Put(Svx3DLightcolor1Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection1Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[1]; aItemSet.Put(Svx3DLightcolor2Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection2Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[2]; aItemSet.Put(Svx3DLightcolor3Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection3Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[3]; aItemSet.Put(Svx3DLightcolor4Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection4Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[4]; aItemSet.Put(Svx3DLightcolor5Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection5Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[5]; aItemSet.Put(Svx3DLightcolor6Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection6Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[6]; aItemSet.Put(Svx3DLightcolor7Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection7Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[7]; aItemSet.Put(Svx3DLightcolor8Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled)); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc index e2d031955867..40faa9531281 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 8c104187797e..5c22b484d138 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -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 @@ -88,7 +88,7 @@ public: // has to be called in case the dialog was closed with OK void commitPendingChanges(); - + private: DECL_LINK( ClickLightSourceButtonHdl, LightButton* ); DECL_LINK( SelectColorHdl, ColorLB* ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src index 57f15a1894d7..4262ad600054 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.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 @@ -63,7 +63,7 @@ TabPage TP_3D_SCENEILLUMINATION SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + FixedText FT_LIGHTSOURCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_HEAD ) ; @@ -114,7 +114,7 @@ TabPage TP_3D_SCENEILLUMINATION { Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ; - Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; + Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; TabStop = TRUE ; DropDown = TRUE ; }; @@ -148,9 +148,9 @@ TabPage TP_3D_SCENEILLUMINATION Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; }; + - - + Control CTL_LIGHT_PREVIEW { Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 3dcaa3092e57..dfb768745528 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -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 @@ -88,7 +88,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) ); - // Make the fixed line separator vertical. + // Make the fixed line separator vertical. aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT); Construct(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 6043b16001ac..f119b38561f5 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -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 @@ -47,13 +47,13 @@ namespace chart class SchAxisLabelTabPage : public SfxTabPage { private: - CheckBox aCbShowDescription; + CheckBox aCbShowDescription; - FixedLine aFlOrder; - RadioButton aRbSideBySide; - RadioButton aRbUpDown; - RadioButton aRbDownUp; - RadioButton aRbAuto; + FixedLine aFlOrder; + RadioButton aRbSideBySide; + RadioButton aRbUpDown; + RadioButton aRbDownUp; + RadioButton aRbAuto; FixedLine aFlSeparator; FixedLine aFlTextFlow; @@ -83,7 +83,7 @@ public: SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); - void Construct(); + void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src index bcba1926c242..a999ab7a4db4 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.src +++ b/chart2/source/controller/dialogs/tp_AxisLabel.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 @@ -29,14 +29,14 @@ TabPage TP_AXIS_LABEL { - HelpID = HID_SCH_TP_AXIS_LABEL; - Size = MAP_APPFONT ( 260 , 185 ) ; - Hide = TRUE; + HelpID = HID_SCH_TP_AXIS_LABEL; + Size = MAP_APPFONT ( 260 , 185 ) ; + Hide = TRUE; CheckBox CB_AXIS_LABEL_SCHOW_DESCR { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 248 , 12 ) ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 248 , 12 ) ; Text [ en-US ] = "Sho~w labels"; }; @@ -50,7 +50,7 @@ TabPage TP_AXIS_LABEL }; Control CT_AXIS_LABEL_DIAL { - HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; + HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; Text = "ABCD" ; @@ -93,9 +93,9 @@ TabPage TP_AXIS_LABEL Control CT_UNUSED { //only necessary for constructor of SvxWinOrientation - Hide = TRUE ; - Pos = MAP_APPFONT ( 204 , 133 ) ; - Size = MAP_APPFONT ( 50 , 15 ) ; + Hide = TRUE ; + Pos = MAP_APPFONT ( 204 , 133 ) ; + Size = MAP_APPFONT ( 50 , 15 ) ; }; FixedLine FL_SEPARATOR { @@ -105,8 +105,8 @@ TabPage TP_AXIS_LABEL FixedLine FL_AXIS_LABEL_TEXTFLOW { - Pos = MAP_APPFONT ( 133 , 22 ) ; - Size = MAP_APPFONT ( 121 , 8 ) ; + Pos = MAP_APPFONT ( 133 , 22 ) ; + Size = MAP_APPFONT ( 121 , 8 ) ; Text [ en-US ] = "Text flow" ; }; @@ -114,7 +114,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 33 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "O~verlap" ; }; @@ -122,7 +122,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 47 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "~Break" ; }; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index ab4e36ff1f84..9c541d4217d7 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -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 @@ -121,7 +121,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn , m_aPB_MajorGrid(this,SchResId(PB_MAJOR_GRID)) , m_aCB_MinorGrid(this,SchResId(CB_MINOR_GRID)) , m_aPB_MinorGrid(this,SchResId(PB_MINOR_GRID)) - + , m_pNumFormatter(NULL) , m_bCrossingAxisIsCategoryAxis(false) , m_aCategories() @@ -139,7 +139,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn m_aFT_CrossesAt.SetSizePixel(m_aFT_CrossesAt.CalcMinimumSize()); long nXPos = m_aFT_CrossesAt.GetPosPixel().X() + m_aFT_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aLB_CrossesAt, nXPos ); - + nXPos += m_aLB_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aED_CrossesAt, nXPos ); lcl_newXPos( m_aED_CrossesAtCategory, nXPos ); @@ -176,14 +176,14 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn { long nWidth_1 = ::std::max( m_aCB_TicksInner.CalcMinimumSize().Width(), m_aCB_MinorInner.CalcMinimumSize().Width() ); long nWidth_2 = ::std::max( m_aCB_TicksOuter.CalcMinimumSize().Width(), m_aCB_MinorOuter.CalcMinimumSize().Width() ); - + long nLeftSpace = nDialogWidth - nWidth_0 - nWidth_1 - nWidth_2 - 3*nDistance; if(nLeftSpace>=0) { m_aFT_Major.SetSizePixel(m_aFT_Major.CalcMinimumSize()); m_aFT_Minor.SetSizePixel(m_aFT_Minor.CalcMinimumSize()); - + m_aCB_TicksInner.SetSizePixel( m_aCB_TicksInner.CalcMinimumSize() ); m_aCB_MinorInner.SetSizePixel( m_aCB_MinorInner.CalcMinimumSize() ); @@ -386,7 +386,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Show(false); m_aFT_LabelDistance.Show(false); m_aED_LabelDistance.Show(false); - + m_aFL_Vertical.Show(false); m_aFT_PlaceTicks.Show(false); m_aLB_PlaceTicks.Show(false); @@ -415,7 +415,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Enable(false); m_aFT_LabelDistance.Enable(false); m_aED_LabelDistance.Enable(false); - + m_aFL_Vertical.Enable(false); m_aFT_PlaceTicks.Enable(false); m_aLB_PlaceTicks.Enable(false); @@ -437,7 +437,7 @@ void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) m_pNumFormatter = pFormatter; m_aED_CrossesAt.SetFormatter( m_pNumFormatter ); m_aED_CrossesAt.UseInputStringForFormatting(); - + const SfxPoolItem *pPoolItem = NULL; if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, TRUE, &pPoolItem ) == SFX_ITEM_SET ) { @@ -489,7 +489,7 @@ IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG ) } m_aFT_PlaceTicks.Enable(bEnableTickmarkPlacement); m_aLB_PlaceTicks.Enable(bEnableTickmarkPlacement); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 0784a7854c5e..ea5d2fc9502d 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -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 @@ -69,7 +69,7 @@ private: //member: ListBox m_aLB_CrossesAt; FormattedField m_aED_CrossesAt; ComboBox m_aED_CrossesAtCategory; - CheckBox m_aCB_AxisBetweenCategories; + CheckBox m_aCB_AxisBetweenCategories; FixedLine m_aFL_Labels; FixedText m_aFT_PlaceLabels; @@ -90,14 +90,14 @@ private: //member: FixedLine m_aFL_Vertical; FixedText m_aFT_PlaceTicks; ListBox m_aLB_PlaceTicks; - + FixedLine m_aFL_Grids; CheckBox m_aCB_MajorGrid; PushButton m_aPB_MajorGrid; CheckBox m_aCB_MinorGrid; PushButton m_aPB_MinorGrid; - SvNumberFormatter* m_pNumFormatter; + SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src index 8ce1ba39056a..80a42f55c353 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.src +++ b/chart2/source/controller/dialogs/tp_AxisPositions.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 @@ -70,7 +70,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Axis line" ; }; - + FixedText FT_CROSSES_OTHER_AXIS_AT { Pos = MAP_APPFONT ( X2 , Y1 ) ; @@ -87,7 +87,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Start" ; @@ -113,7 +113,7 @@ TabPage TP_AXIS_POSITIONS DropDown = TRUE ; TabStop = TRUE ; }; - + CheckBox CB_AXIS_BETWEEN_CATEGORIES { Hide = TRUE; @@ -122,7 +122,7 @@ TabPage TP_AXIS_POSITIONS TabStop = TRUE ; Text [ en-US ] = "Axis ~between categories" ; }; - + FixedLine FL_LABELS { Pos = MAP_APPFONT ( X1 , Y3 ) ; @@ -145,7 +145,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Near axis" ; @@ -154,7 +154,7 @@ TabPage TP_AXIS_POSITIONS "Outside end" ; }; }; - + FixedText FT_AXIS_LABEL_DISTANCE { Hide = TRUE; @@ -171,7 +171,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 89 , 12 ) ; TabStop = TRUE ; }; - + FixedLine FL_TICKS { Pos = MAP_APPFONT ( X1 , Y6 ) ; @@ -196,7 +196,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Outer"; }; - + FixedText FT_MINOR { Pos = MAP_APPFONT ( XTICK_1 , Y8 ) ; @@ -215,7 +215,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "O~uter"; }; - + FixedLine FL_VERTICAL { Hide = TRUE ; @@ -223,7 +223,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 6 , 25 ) ; Vert = TRUE ; }; - + FixedText FT_PLACE_TICKS { Pos = MAP_APPFONT ( X2 , Y9 ); @@ -240,7 +240,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "At labels" ; @@ -248,8 +248,8 @@ TabPage TP_AXIS_POSITIONS "At axis and labels" ; }; }; - - + + FixedLine FL_GRIDS { Hide = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index ec6c1d2a1c10..11a6d7ae88ab 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -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 @@ -472,9 +472,9 @@ private: MetricField m_aMF_SplineOrder; FixedLine m_aFL_DialogButtons; - OKButton m_aBP_OK; - CancelButton m_aBP_Cancel; - HelpButton m_aBP_Help; + OKButton m_aBP_OK; + CancelButton m_aBP_Cancel; + HelpButton m_aBP_Help; }; SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) @@ -507,7 +507,7 @@ void SplinePropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) { adjustControlPositions(); adjustSize(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.hrc b/chart2/source/controller/dialogs/tp_ChartType.hrc index dc017f836dc7..badea77502c5 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hrc +++ b/chart2/source/controller/dialogs/tp_ChartType.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 @@ -32,14 +32,14 @@ #define BTN_HELP 1 #define LB_3D_SCHEME 1 -#define LB_CHARTTYPE 2 +#define LB_CHARTTYPE 2 #define CT_CHARTVARIANT 3 #define FL_SPLINE_SEPARATOR 2 #define FL_SPLINE_DIALOGBUTTONS 3 -#define FT_CHARTTYPE 1 -#define FT_SPLINE_ORDER 3 +#define FT_CHARTTYPE 1 +#define FT_SPLINE_ORDER 3 #define FT_SPLINE_RESOLUTION 4 #define CB_X_AXIS_CATEGORIES 1 diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index b40cbb1956db..7e4208e367f1 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -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 @@ -72,8 +72,8 @@ public: , bool bDoLiveUpdate, bool bHideDescription = false ); virtual ~ChartTypeTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const; @@ -83,7 +83,7 @@ protected: void showAllControls( ChartTypeDialogController& rTypeController ); void fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList=true ); ChartTypeParameter getCurrentParamter() const; - + virtual void stateChanged( ChangingResource* pResource ); void commitToModel( const ChartTypeParameter& rParameter ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index a9bb2a039f3c..639553e53a8a 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.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 @@ -164,7 +164,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( 12 , 14 ) ; Text [ en-US ] = "Properties..." ; }; - + CheckBox CB_XVALUE_SORTING { TabStop = TRUE ; @@ -172,7 +172,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; Text [ en-US ] = "~Sort by X values" ; }; - + }; ModalDialog DLG_SPLINE_PROPERTIES diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 909c263ba83b..a0a34f3f6608 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -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/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 25bdf977ef0e..c71e4032fb2b 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -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/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src index 615e81c2c550..4907b3d8a5b8 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.src +++ b/chart2/source/controller/dialogs/tp_DataLabel.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 diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 7c5f0fb3967b..ac867040abfe 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -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 @@ -144,7 +144,7 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry ) } static long lcl_pRoleListBoxTabs[] = - { 3, // Number of Tabs + { 3, // Number of Tabs 0, 0, 75 }; @@ -331,7 +331,7 @@ DataSourceTabPage::DataSourceTabPage( m_aEDT_CATEGORIES.SetModifyHdl( LINK( this, DataSourceTabPage, RangeModifiedHdl )); m_aEDT_RANGE.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); m_aEDT_CATEGORIES.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); - + // #i75179# enable setting the background to a different color m_aEDT_RANGE.SetStyle( m_aEDT_RANGE.GetStyle() | WB_FORCECTRLBACKGROUND ); m_aEDT_CATEGORIES.SetStyle( m_aEDT_CATEGORIES.GetStyle() | WB_FORCECTRLBACKGROUND ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hrc b/chart2/source/controller/dialogs/tp_DataSource.hrc index cf8147d5f775..07bf3b727293 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hrc +++ b/chart2/source/controller/dialogs/tp_DataSource.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 diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index e65b503bfcc2..d20dc93d37f0 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -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 @@ -94,7 +94,7 @@ protected: //TabPage virtual void DeactivatePage(); - virtual void initializePage(); + virtual void initializePage(); DECL_LINK( SeriesSelectionChangedHdl, void* ); DECL_LINK( RoleSelectionChangedHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src index 3e1f8a51c68a..da0a98caf44b 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.src +++ b/chart2/source/controller/dialogs/tp_DataSource.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 diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index b6f7ad680591..aae2def63232 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -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/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index c1ebf512911c..f0d17cbbc15c 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -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/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 395c956372ea..1e525f4bf903 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -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/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index f6d6779d34a9..ccf77f9a7f79 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -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/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..6d8efc0414f9 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.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 @@ -31,7 +31,7 @@ TabPage TP_YERRORBAR { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; +// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_ERRORBARS( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index e3d23366a820..709b3fc0fb1d 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -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/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 4c0e7ce545d7..a70ba4ce3456 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -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 @@ -44,7 +44,7 @@ class LegendPositionResources; class SchLegendPosTabPage : public SfxTabPage { private: - FixedLine aGrpLegend; + FixedLine aGrpLegend; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..cddd3f830f87 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.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 diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx index a8a4d1317be8..370a6e9089c3 100644 --- a/chart2/source/controller/dialogs/tp_Location.cxx +++ b/chart2/source/controller/dialogs/tp_Location.cxx @@ -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/chart2/source/controller/dialogs/tp_Location.hrc b/chart2/source/controller/dialogs/tp_Location.hrc index 419daa68721f..0879118708e6 100644 --- a/chart2/source/controller/dialogs/tp_Location.hrc +++ b/chart2/source/controller/dialogs/tp_Location.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 diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx index 4b5b2c24727d..2dfa8a560823 100644 --- a/chart2/source/controller/dialogs/tp_Location.hxx +++ b/chart2/source/controller/dialogs/tp_Location.hxx @@ -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/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..4fbac61b42c3 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.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 diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 661bae6ac326..5dd900e71f05 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -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/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index d26ce62732eb..1796219a7bff 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -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/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..d136673244f8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.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 diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 9a193c028e05..8425741cd819 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -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/chart2/source/controller/dialogs/tp_PolarOptions.hrc b/chart2/source/controller/dialogs/tp_PolarOptions.hrc index b60e50fa654e..ee0d2aeac787 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hrc +++ b/chart2/source/controller/dialogs/tp_PolarOptions.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 diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 1465790c34bd..8c5791b7133c 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -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 @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual BOOL FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); - + private: CheckBox m_aCB_Clockwise; FixedLine m_aFL_StartingAngle; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src index 237fa027b55f..f752f9483fd5 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.src +++ b/chart2/source/controller/dialogs/tp_PolarOptions.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 @@ -49,7 +49,7 @@ TabPage TP_POLAROPTIONS }; Control CT_ANGLE_DIAL { - HelpId = HID_SCH_STARTING_ANGLE_DIAL ; + HelpId = HID_SCH_STARTING_ANGLE_DIAL ; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 3ba6ca0f74b2..9dbf77210951 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -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/chart2/source/controller/dialogs/tp_RangeChooser.hrc b/chart2/source/controller/dialogs/tp_RangeChooser.hrc index d7b593fc4f45..a7300a02202a 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hrc +++ b/chart2/source/controller/dialogs/tp_RangeChooser.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 diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 4d985669195c..31ca776953a7 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -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/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index de07c9763b7d..69d6562cf6f0 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.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 diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 34fc0702bafe..2f7085215526 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -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 @@ -114,14 +114,14 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aTxtHelp (this, SchResId (TXT_STEP_HELP)), aMtStepHelp (this, SchResId (MT_STEPHELP)), aCbxAutoStepHelp(this, SchResId(CBX_AUTO_STEP_HELP)), - + aTxtOrigin (this, SchResId (TXT_ORIGIN)), aFmtFldOrigin(this, SchResId(EDT_ORIGIN)), aCbxAutoOrigin(this, SchResId(CBX_AUTO_ORIGIN)), aCbxLogarithm(this, SchResId(CBX_LOGARITHM)), aCbxReverse(this, SchResId(CBX_REVERSE)), - + fMin(0.0), fMax(0.0), fStepMain(0.0), @@ -145,10 +145,10 @@ void ScaleTabPage::StateChanged( StateChangedType nType ) { TabPage::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) AdjustControlPositions(); } - + void ScaleTabPage::AdjustControlPositions() { //optimize position of the controls @@ -167,7 +167,7 @@ void ScaleTabPage::AdjustControlPositions() aCbxAutoStepMain.SetSizePixel( aCbxAutoStepMain.CalcMinimumSize() ); aCbxAutoStepHelp.SetSizePixel( aCbxAutoStepHelp.CalcMinimumSize() ); aCbxAutoOrigin.SetSizePixel( aCbxAutoOrigin.CalcMinimumSize() ); - + //ensure new pos is ok long nWidthOfOtherControls = aCbxAutoMin.GetPosPixel().X() + aCbxAutoMin.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X(); long nDialogWidth = GetSizePixel().Width(); @@ -182,7 +182,7 @@ void ScaleTabPage::AdjustControlPositions() aTxtMain.SetSizePixel(aSize); aTxtHelp.SetSizePixel(aSize); aTxtOrigin.SetSizePixel(aSize); - + lcl_shiftControls( aFmtFldMin, aCbxAutoMin, nNewXPos ); lcl_shiftControls( aFmtFldMax, aCbxAutoMax, nNewXPos ); lcl_shiftControls( aFmtFldStepMain, aCbxAutoStepMain, nNewXPos ); @@ -256,16 +256,16 @@ BOOL ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) { DBG_ASSERT( pNumFormatter, "No NumberFormatter available" ); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,aCbxAutoStepHelp.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,aCbxAutoOrigin.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,aCbxLogarithm.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,aCbxReverse.IsChecked())); - rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); - rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); + rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); + rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp)); - rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); + rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,aCbxAutoStepMain.IsChecked())); rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN)); @@ -386,7 +386,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + //check wich entries need user action // check for entries that cannot be parsed for the current number format @@ -423,7 +423,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + if( ShowWarning( nErrStrId, pEdit ) ) return KEEP_PAGE; @@ -440,7 +440,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.SetFormatter( pNumFormatter ); aFmtFldStepMain.SetFormatter( pNumFormatter ); aFmtFldOrigin.SetFormatter( pNumFormatter ); - + // #101318#, #i6278# allow more decimal places than the output format. As // the numbers shown in the edit fields are used for input, it makes more // sense to display the values in the input format rather than the output @@ -449,7 +449,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.UseInputStringForFormatting(); aFmtFldStepMain.UseInputStringForFormatting(); aFmtFldOrigin.UseInputStringForFormatting(); - + SetNumFormat(); } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 8d0e02186c38..2001b5f336b4 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -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 @@ -62,46 +62,46 @@ public: virtual void StateChanged( StateChangedType nType ); private: - FixedLine aFlScale; + FixedLine aFlScale; - FixedText aTxtMin; - FormattedField aFmtFldMin; - CheckBox aCbxAutoMin; + FixedText aTxtMin; + FormattedField aFmtFldMin; + CheckBox aCbxAutoMin; - FixedText aTxtMax; - FormattedField aFmtFldMax; - CheckBox aCbxAutoMax; + FixedText aTxtMax; + FormattedField aFmtFldMax; + CheckBox aCbxAutoMax; FixedText aTxtMain; - FormattedField aFmtFldStepMain; - CheckBox aCbxAutoStepMain; + FormattedField aFmtFldStepMain; + CheckBox aCbxAutoStepMain; FixedText aTxtHelp; MetricField aMtStepHelp; - CheckBox aCbxAutoStepHelp; + CheckBox aCbxAutoStepHelp; FixedText aTxtOrigin; - FormattedField aFmtFldOrigin; - CheckBox aCbxAutoOrigin; - - CheckBox aCbxLogarithm; + FormattedField aFmtFldOrigin; + CheckBox aCbxAutoOrigin; + + CheckBox aCbxLogarithm; CheckBox aCbxReverse; - - double fMin; - double fMax; - double fStepMain; + + double fMin; + double fMax; + double fStepMain; sal_Int32 nStepHelp; - double fOrigin; + double fOrigin; int nAxisType; - SvNumberFormatter* pNumFormatter; + SvNumberFormatter* pNumFormatter; bool m_bShowAxisOrigin; - + void AdjustControlPositions(); void EnableControls(); - + DECL_LINK( EnableValueHdl, CheckBox* ); - + /** shows a warning window due to an invalid input. @param nResIdMessage diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..7ff88bfc6158 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.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 @@ -77,7 +77,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Automatic" ; }; - + FixedText TXT_MAX { Pos = MAP_APPFONT ( X2 , Y2 ) ; @@ -148,7 +148,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Aut~omatic" ; }; - + FixedText TXT_ORIGIN { Pos = MAP_APPFONT ( X2 , Y5 ) ; @@ -170,7 +170,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Automat~ic" ; }; - + CheckBox CBX_LOGARITHM { Pos = MAP_APPFONT ( X2 , Y6 ) ; @@ -178,7 +178,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Logarithmic scale" ; }; - + CheckBox CBX_REVERSE { Pos = MAP_APPFONT ( X2 , Y7 ) ; @@ -186,5 +186,5 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Reverse direction" ; }; - + }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index fbe2f4bf1907..97fc327c8d0b 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -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 @@ -63,11 +63,11 @@ SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aCBConnect(this,SchResId(CB_CONNECTOR)), aCBAxisSideBySide(this,SchResId(CB_BARS_SIDE_BY_SIDE)), m_aFL_PlotOptions(this,SchResId(FL_PLOT_OPTIONS)), - m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), + m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), m_aRB_DontPaint(this,SchResId(RB_DONT_PAINT)), m_aRB_AssumeZero(this,SchResId(RB_ASSUME_ZERO)), m_aRB_ContinueLine(this,SchResId(RB_CONTINUE_LINE)), - m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), + m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), m_bProvidesSecondaryYAxis(true), m_bProvidesOverlapAndGapWidth(false) { @@ -158,13 +158,13 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); aMTOverlap.SetValue(nTmp); } - + if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET) { BOOL bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); aCBConnect.Check(bCheck); } - + if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, TRUE, &pPoolItem) == SFX_ITEM_SET) { m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); @@ -194,7 +194,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) m_aRB_DontPaint.Enable(FALSE); m_aRB_AssumeZero.Enable(FALSE); m_aRB_ContinueLine.Enable(FALSE); - + for( sal_Int32 nN =0; nN& xContext ); virtual ~TitlesAndObjectsTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual bool canAdvance() const; protected: @@ -69,7 +69,7 @@ protected: protected: FixedText m_aFT_TitleDescription; FixedLine m_aFL_Vertical; - + ::std::auto_ptr< TitleResources > m_apTitleResources; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index a17f5655e751..41fa87c916a8 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.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 diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 48c96a715c5f..adba51c46852 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -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 @@ -199,7 +199,7 @@ void DrawViewWrapper::ReInit() bBordVisible = false; bGridVisible = false; bHlplVisible = false; - + this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object) //this->SetResizeAtCenter(true);//for interactive resize-dragging: keep the object center fix @@ -243,7 +243,7 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const if( pRet ) { //ignore some special shapes - rtl::OUString aShapeName = pRet->GetName(); + rtl::OUString aShapeName = pRet->GetName(); if( aShapeName.match(C2U("PlotAreaIncludingAxes")) || aShapeName.match(C2U("PlotAreaExcludingAxes")) ) { pRet->SetMarkProtect( true ); @@ -316,7 +316,7 @@ SdrObject* DrawViewWrapper::getSelectedObject() const SdrObject* DrawViewWrapper::getTextEditObject() const { SdrObject* pObj = this->getSelectedObject(); - SdrObject* pTextObj = NULL; + SdrObject* pTextObj = NULL; if( pObj && pObj->HasTextEdit()) pTextObj = (SdrTextObj*)pObj; return pTextObj; @@ -392,7 +392,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } E3dView::Notify(rBC, rHint); - + if( pSdrHint != 0 ) { SdrHintKind eKind = pSdrHint->GetKind(); diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 755058050a2d..e89d2f2ea239 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -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 @@ -176,7 +176,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co if( nStandardSymbol >= static_cast(pSymbolList->GetObjCount()) ) nStandardSymbol %= pSymbolList->GetObjCount(); SdrObject* pObj = pSymbolList->GetObj(nStandardSymbol); - + VirtualDevice aVDev; aVDev.SetMapMode(MapMode(MAP_100TH_MM)); SdrModel* pModel = new SdrModel(); @@ -221,7 +221,7 @@ FontList* ViewElementListProvider::getFontList() const if(!m_pFontList) { OutputDevice* pRefDev = m_pDrawModelWrapper ? m_pDrawModelWrapper->getReferenceDevice() : NULL; - OutputDevice* pDefaultOut = Application::GetDefaultDevice(); // #67730# + OutputDevice* pDefaultOut = Application::GetDefaultDevice(); // #67730# m_pFontList = new FontList( pRefDev ? pRefDev : pDefaultOut , pRefDev ? pDefaultOut : NULL , FALSE ); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index ea52a29c614b..78d9141d25c1 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -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/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 2cc46825a5aa..a0197dbf0c31 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -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/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 66ef9338dc09..22cca83f374d 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -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/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index 7c8f83452963..6e30e6c7ba24 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -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 @@ -77,7 +77,7 @@ private: ::std::vector< ItemConverter * > m_aConverters; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDoc; diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index d2590c37759c..40dc37f8de81 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -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/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index f06c502dfd6c..af38d88f85e1 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -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 @@ -91,7 +91,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > impl_getDrawPage() const throw (::com::sun::star::uno::RuntimeException); - + protected: // ____ chart::XChartDocument ____ @@ -207,7 +207,7 @@ private: //methods private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xTitle; diff --git a/chart2/source/controller/inc/ChartRenderer.hxx b/chart2/source/controller/inc/ChartRenderer.hxx index c602a6ec6630..4ce2b583dc65 100644 --- a/chart2/source/controller/inc/ChartRenderer.hxx +++ b/chart2/source/controller/inc/ChartRenderer.hxx @@ -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 @@ -42,7 +42,7 @@ namespace chart { //............................................................................. -//#i82893#, #i75867#: charts must be painted resolution dependent!! +//#i82893#, #i75867#: charts must be painted resolution dependent!! class ChartRenderer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XUnoTunnel diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx index 0cc8180b3dd2..01be5921addb 100644 --- a/chart2/source/controller/inc/ConfigurationAccess.hxx +++ b/chart2/source/controller/inc/ConfigurationAccess.hxx @@ -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/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index d738cf8f6245..72dce1cce8db 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -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/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 1dbdf6a85a53..23d69e0ba7fc 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -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/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 9dffde68cd5b..1d7f969e7ed1 100755 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -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/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index c10e1d4e5b86..2e2af8139cb9 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -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/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 1052b7ea962f..244b3d71dfa7 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.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 @@ -75,14 +75,14 @@ #define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36) #define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37) /* -#define HID_SCH_LAYOUT (HID_SCH_START + 38) +#define HID_SCH_LAYOUT (HID_SCH_START + 38) -#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) +#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) #define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3 -#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) +#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) */ -#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) +#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) #define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44) #define HID_SCH_LB_BAR_GEOMETRY (HID_SCH_START + 45) @@ -176,7 +176,7 @@ // 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein // Define sondern neuerdings ein Enum ist -//#define HID_SCH_VIEWSHELL_DOCUMENT (453) +//#define HID_SCH_VIEWSHELL_DOCUMENT (453) #endif diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 2f52e45f070c..e10e42728464 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -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/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index 809df66156e2..fce39728ca67 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -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/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index b1b0bcdeea75..4ed8392bb792 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -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/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc index 38a09ad35ded..6c899fc78a25 100644 --- a/chart2/source/controller/inc/MenuResIds.hrc +++ b/chart2/source/controller/inc/MenuResIds.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 diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 9b0555ec82e1..bcbb420577e6 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -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/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 32c48ca8e7db..de8f785cc75d 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -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/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 857b576fe6ef..8c52321ad120 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -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 @@ -81,7 +81,7 @@ public: sal_Int32 getIndexInParent( const tOID& rNode ) const; private: - + ::std::auto_ptr< impl::ImplObjectHierarchy > m_apImpl; }; diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 02ecc8f229c8..92c5198ebd88 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -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: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType ); - + static rtl::OUString getNameForCID( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 312c92997055..bdbb032e4bfd 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -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/chart2/source/controller/inc/RangeEdit.hxx b/chart2/source/controller/inc/RangeEdit.hxx index cacba52decb5..046205f1b7ee 100755 --- a/chart2/source/controller/inc/RangeEdit.hxx +++ b/chart2/source/controller/inc/RangeEdit.hxx @@ -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/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx index 4aedf9012489..a2b4826f35ca 100644 --- a/chart2/source/controller/inc/RangeSelectionButton.hxx +++ b/chart2/source/controller/inc/RangeSelectionButton.hxx @@ -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/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index cb9e067bd8e2..57c511bdb981 100755 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -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/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 3e470c0116f0..d656aaeee52d 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -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/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index ab2d29cb5e0d..2c62edbc5e3d 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -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/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 5fe5313c8d4a..a149f39d7446 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -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/chart2/source/controller/inc/SchSlotIds.hxx b/chart2/source/controller/inc/SchSlotIds.hxx index 601e64100bbf..5f3e637dbf08 100644 --- a/chart2/source/controller/inc/SchSlotIds.hxx +++ b/chart2/source/controller/inc/SchSlotIds.hxx @@ -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,39 +32,39 @@ // SID_OBJ1_START == 30000 + 512 //not used as slot in old chart -//#define SID_COPYFORMAT SID_OBJ1_START +//#define SID_COPYFORMAT SID_OBJ1_START //not used as slot in old chart -//#define SID_PASTEFORMAT (SID_OBJ1_START + 1) +//#define SID_PASTEFORMAT (SID_OBJ1_START + 1) //still used as help id #define SID_DIAGRAM_DATA (SID_OBJ1_START + 2) //only used as help id -#define SID_INSERT_TITLE (SID_OBJ1_START + 3) +#define SID_INSERT_TITLE (SID_OBJ1_START + 3) //only used as help id -#define SID_INSERT_CHART_LEGEND (SID_OBJ1_START + 4) +#define SID_INSERT_CHART_LEGEND (SID_OBJ1_START + 4) //only used as help id -#define SID_INSERT_DESCRIPTION (SID_OBJ1_START + 5) +#define SID_INSERT_DESCRIPTION (SID_OBJ1_START + 5) //only used as help id -#define SID_INSERT_AXIS (SID_OBJ1_START + 6) +#define SID_INSERT_AXIS (SID_OBJ1_START + 6) //some how used as slot in old chart -//#define SID_DATA_ROW_POINT (SID_OBJ1_START + 7) +//#define SID_DATA_ROW_POINT (SID_OBJ1_START + 7) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_CHART_TITLE (SID_OBJ1_START + 8) +//MENUCHANGE FORMATMENU #define SID_CHART_TITLE (SID_OBJ1_START + 8) //still used as slot id -//MENUCHANGE FORMATMENU #define SID_LEGEND (SID_OBJ1_START + 9) +//MENUCHANGE FORMATMENU #define SID_LEGEND (SID_OBJ1_START + 9) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_DIAGRAM_AXIS (SID_OBJ1_START + 10) +//MENUCHANGE FORMATMENU #define SID_DIAGRAM_AXIS (SID_OBJ1_START + 10) //menu parent id and helpid -//MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID (SID_OBJ1_START + 11) +//MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID (SID_OBJ1_START + 11) /* //MENUCHANGE //still used as slot id -#define SID_DIAGRAM_WALL (SID_OBJ1_START + 12) +#define SID_DIAGRAM_WALL (SID_OBJ1_START + 12) //still used as slot id -#define SID_DIAGRAM_FLOOR (SID_OBJ1_START + 13) +#define SID_DIAGRAM_FLOOR (SID_OBJ1_START + 13) //still used as slot id -#define SID_DIAGRAM_AREA (SID_OBJ1_START + 14) +#define SID_DIAGRAM_AREA (SID_OBJ1_START + 14) */ //only used as help id @@ -74,32 +74,32 @@ //used as slot in old chart //#define SID_TOGGLE_TITLE (SID_OBJ1_START + 17) //used as slot in old chart -//#define SID_TOGGLE_LEGEND (SID_OBJ1_START + 18) +//#define SID_TOGGLE_LEGEND (SID_OBJ1_START + 18) //used as slot in old chart -//#define SID_TOGGLE_AXIS_TITLE (SID_OBJ1_START + 19) +//#define SID_TOGGLE_AXIS_TITLE (SID_OBJ1_START + 19) //used as slot in old chart -//#define SID_TOGGLE_AXIS_DESCR (SID_OBJ1_START + 20) // 30532 +//#define SID_TOGGLE_AXIS_DESCR (SID_OBJ1_START + 20) // 30532 //used as slot in old chart -//#define SID_TOGGLE_GRID_HORZ (SID_OBJ1_START + 21) +//#define SID_TOGGLE_GRID_HORZ (SID_OBJ1_START + 21) //used as slot in old chart -//#define SID_TOGGLE_GRID_VERT (SID_OBJ1_START + 22) +//#define SID_TOGGLE_GRID_VERT (SID_OBJ1_START + 22) //used as slot in old chart -//#define SID_DATA_IN_ROWS (SID_OBJ1_START + 23) +//#define SID_DATA_IN_ROWS (SID_OBJ1_START + 23) //used as slot in old chart -//#define SID_DATA_IN_COLUMNS (SID_OBJ1_START + 24) +//#define SID_DATA_IN_COLUMNS (SID_OBJ1_START + 24) //used as slot in old chart -//#define SID_TOOL_SELECT (SID_OBJ1_START + 25) +//#define SID_TOOL_SELECT (SID_OBJ1_START + 25) //some how used as slot in old chart -//#define SID_CONTEXT_TYPE (SID_OBJ1_START + 26) +//#define SID_CONTEXT_TYPE (SID_OBJ1_START + 26) //used as slot in old chart //#define SID_NEW_ARRANGEMENT (SID_OBJ1_START + 27) // 30539 //only used as help id -#define SID_INSERT_GRIDS (SID_OBJ1_START + 28) +#define SID_INSERT_GRIDS (SID_OBJ1_START + 28) //not used as slot in old chart -//#define SID_MAINTITLE (SID_OBJ1_START + 29) +//#define SID_MAINTITLE (SID_OBJ1_START + 29) //not used as slot in old chart -//#define SID_SUBTITLE (SID_OBJ1_START + 30) +//#define SID_SUBTITLE (SID_OBJ1_START + 30) //not used as slot in old chart //#define SID_XAXIS_TITLE (SID_OBJ1_START + 31) //not used as slot in old chart @@ -112,7 +112,7 @@ #ifdef SID_UPDATE #undef SID_UPDATE #endif -#define SID_UPDATE (SID_OBJ1_START + 34) +#define SID_UPDATE (SID_OBJ1_START + 34) */ //not used as slot in old chart @@ -154,24 +154,24 @@ //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_ALL (SID_OBJ1_START + 54) //used as slot in old chart -//#define SID_HAS_X_DESCR (SID_OBJ1_START + 55) +//#define SID_HAS_X_DESCR (SID_OBJ1_START + 55) //used as slot in old chart -//#define SID_HAS_Y_DESCR (SID_OBJ1_START + 56) +//#define SID_HAS_Y_DESCR (SID_OBJ1_START + 56) //used as slot in old chart -//#define SID_HAS_Z_DESCR (SID_OBJ1_START + 57) +//#define SID_HAS_Z_DESCR (SID_OBJ1_START + 57) //#define SID_DIAGRAM_OBJECTS (SID_OBJ1_START + 60) //not used as slot in old chart -//#define SID_HAS_X_TITLE (SID_OBJ1_START + 61) +//#define SID_HAS_X_TITLE (SID_OBJ1_START + 61) //not used as slot in old chart -//#define SID_HAS_Y_TITLE (SID_OBJ1_START + 62) +//#define SID_HAS_Y_TITLE (SID_OBJ1_START + 62) //not used as slot in old chart -//#define SID_HAS_Z_TITLE (SID_OBJ1_START + 63) +//#define SID_HAS_Z_TITLE (SID_OBJ1_START + 63) //not used as slot in old chart -//#define SID_HAS_MAIN_TITLE (SID_OBJ1_START + 64) +//#define SID_HAS_MAIN_TITLE (SID_OBJ1_START + 64) //not used as slot in old chart -//#define SID_HAS_SUB_TITLE (SID_OBJ1_START + 65) +//#define SID_HAS_SUB_TITLE (SID_OBJ1_START + 65) //still used as slot id //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_Y_HELP (SID_OBJ1_START + 66) @@ -181,10 +181,10 @@ //MENUCHANGE FORMATMENU #define SID_DIAGRAM_GRID_Z_HELP (SID_OBJ1_START + 68) //not used as slot in old chart -//#define SID_DIAGRAM_DATA_WIN (SID_OBJ1_START + 70) +//#define SID_DIAGRAM_DATA_WIN (SID_OBJ1_START + 70) //used as slot in old chart -//#define SID_DIAGRAM_ERROR (SID_OBJ1_START + 71) +//#define SID_DIAGRAM_ERROR (SID_OBJ1_START + 71) //used as slot in old chart //#define SID_DIAGRAM_AVERAGEVALUE (SID_OBJ1_START + 72) //used as slot in old chart @@ -213,7 +213,7 @@ //#define SID_ROW_MOREBACK (SID_OBJ1_START + 83) //not used as slot in old chart -//#define SID_TITLE_TEXT (SID_OBJ1_START + 100) +//#define SID_TITLE_TEXT (SID_OBJ1_START + 100) //somehow used as slot in old chart //#define SID_DIAGRAM_STOCK_LINE (SID_OBJ1_START + 101) //used as slot in old chart diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 207a6ab7f0ee..627d0cae9f06 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -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,7 +66,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::XComponentContext> m_xCC; bool m_bAttachToMainAxis; bool m_bSupportingOverlapAndGapWidthProperties; diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc index 6c7b43526d22..baaf28d180bc 100644 --- a/chart2/source/controller/inc/ShapeController.hrc +++ b/chart2/source/controller/inc/ShapeController.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 diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index cb4227185093..1755420c18e0 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -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/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index 41e41dbde308..c4348dbd2122 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -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/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index 626724289187..469bcf130b36 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -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/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 768cca0fe8c6..3b30dda31b3d 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -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/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index fadcdad4aab3..fb748a918859 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -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/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 535e36226a12..8e5466fa98a4 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -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/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx index 61a68d6f8b4c..41eebea43f20 100644 --- a/chart2/source/controller/inc/ViewElementListProvider.hxx +++ b/chart2/source/controller/inc/ViewElementListProvider.hxx @@ -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/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 4144531ed77e..1dcdee9cb0bd 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -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,12 +53,12 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~ChartTypeDialog(); - + private: FixedLine m_aFL; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ChartTypeTabPage* m_pChartTypeTabPage; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index c8abda3cb19a..f3d621519d67 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -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 @@ -57,7 +57,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const com::sun::star::uno::Any& _rValue); - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); // XTypeProvider virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); @@ -76,7 +76,7 @@ private: ChartTypeUnoDlg(); ChartTypeUnoDlg(const ChartTypeUnoDlg&); // no defined void operator =(const ChartTypeUnoDlg&); // no defined - + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; }; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index e70976ad1a4c..e46475166c9f 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -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 @@ -49,12 +49,12 @@ class DataSourceTabPage; class ChartTypeTemplateProvider; class DialogModel; -class CreationWizard : public +class CreationWizard : public svt::RoadmapWizard , public TabPageNotifiable { public: - CreationWizard( Window* pParent, + CreationWizard( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< @@ -69,9 +69,9 @@ public: virtual void setValidPage( TabPage * pTabPage ); protected: - virtual sal_Bool leaveState( WizardState _nState ); - virtual WizardState determineNextState(WizardState nCurrentState) const; - virtual void enterState(WizardState nState); + virtual sal_Bool leaveState( WizardState _nState ); + virtual WizardState determineNextState(WizardState nCurrentState) const; + virtual void enterState(WizardState nState); virtual String getStateDisplayName( WizardState nState ) const; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 9f546f1a72d6..85606e90a18f 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -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 @@ -72,11 +72,11 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) - + // XExecutableDialog virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); @@ -87,7 +87,7 @@ public: // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& 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); //XPropertySet diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index e5cd252df69d..a30831bd2ac8 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -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 @@ -118,4 +118,4 @@ private: } // namespace chart -#endif // _SCH_DGRDATA_HXX +#endif // _SCH_DGRDATA_HXX diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index f94c95b33370..dcbdc6699de0 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -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 @@ -82,9 +82,9 @@ protected: private: DataSourceTabControl* m_pTabControl; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; RangeChooserTabPage * m_pRangeChooserTabePage; DataSourceTabPage * m_pDataSourceTabPage; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 5ed06d365fa2..da1ac0660417 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -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 @@ -58,21 +58,21 @@ struct InsertAxisOrGridDialogData class SchAxisDlg : public ModalDialog { protected: - FixedLine aFlPrimary; - FixedLine aFlPrimaryGrid; - CheckBox aCbPrimaryX; - CheckBox aCbPrimaryY; - CheckBox aCbPrimaryZ; + FixedLine aFlPrimary; + FixedLine aFlPrimaryGrid; + CheckBox aCbPrimaryX; + CheckBox aCbPrimaryY; + CheckBox aCbPrimaryZ; - FixedLine aFlSecondary; - FixedLine aFlSecondaryGrid; - CheckBox aCbSecondaryX; - CheckBox aCbSecondaryY; - CheckBox aCbSecondaryZ; + FixedLine aFlSecondary; + FixedLine aFlSecondaryGrid; + CheckBox aCbSecondaryX; + CheckBox aCbSecondaryY; + CheckBox aCbSecondaryZ; - OKButton aPbOK; - CancelButton aPbCancel; - HelpButton aPbHelp; + OKButton aPbOK; + CancelButton aPbCancel; + HelpButton aPbHelp; public: SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, BOOL bAxisDlg=true ); diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index a22333b5bdc8..6de88969720d 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -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 @@ -49,12 +49,12 @@ class DataLabelResources; class DataLabelsDialog : public ModalDialog { private: - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ::std::auto_ptr< DataLabelResources > m_apDataLabelResources; - const SfxItemSet& m_rInAttrs; + const SfxItemSet& m_rInAttrs; void Reset(); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 3554337d9deb..c8bf074f662a 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -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/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index 8ab7f285b5a9..49db40bb89c4 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -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 @@ -49,9 +49,9 @@ class SchLegendDlg : public ModalDialog private: ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 41eeac7a1055..c01442f63b6b 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -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 @@ -44,10 +44,10 @@ class SchTitleDlg : public ModalDialog { private: ::std::auto_ptr< TitleResources > m_apTitleResources; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SchTitleDlg( Window* pParent, const TitleDialogData& rInput ); diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx index 34819f6e0e16..a54d5ccdce19 100644 --- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx +++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx @@ -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/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 8ceabdbe33b7..8f5409e261cc 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -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 @@ -44,8 +44,8 @@ public: ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ); virtual ~ObjectPropertiesDialogParameter(); - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - ObjectType getObjectType() const; + void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + ObjectType getObjectType() const; rtl::OUString getLocalizedName() const; bool HasGeometryProperties() const; @@ -65,16 +65,16 @@ public: bool ShowAxisOrigin() const; bool IsCrossingAxisIsCategoryAxis() const; const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; private: - rtl::OUString m_aObjectCID; - ObjectType m_eObjectType; + rtl::OUString m_aObjectCID; + ObjectType m_eObjectType; bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - rtl::OUString m_aLocalizedName; + rtl::OUString m_aLocalizedName; bool m_bHasGeometryProperties; bool m_bHasStatisticProperties; @@ -111,15 +111,15 @@ class SchAttribTabDlg : public SfxTabDialog private: ObjectType eObjectType; bool bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - USHORT nDlgType; - USHORT nPageType; + USHORT nDlgType; + USHORT nPageType; const ObjectPropertiesDialogParameter * const m_pParameter; - const ViewElementListProvider* const m_pViewElementListProvider; + const ViewElementListProvider* const m_pViewElementListProvider; SvNumberFormatter* m_pNumberFormatter; SfxItemSet* m_pSymbolShapeProperties; - Graphic* m_pAutoSymbolGraphic; + Graphic* m_pAutoSymbolGraphic; double m_fAxisMinorStepWidthForErrorBarDecimals; bool m_bOKPressed; diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index ec1b6553bd64..c576d82cf2da 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -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/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index 2bc57bfcffc2..c326e1cb9c24 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -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/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 91b16d3512d8..ebfd7a16865e 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -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 @@ -64,9 +64,9 @@ public: private: TabControl m_aTabControl; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; + HelpButton m_aBtnHelp; ThreeD_SceneGeometry_TabPage* m_pGeometry; ThreeD_SceneAppearance_TabPage* m_pAppearance; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 0b5f33b5c128..f0007199c134 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -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/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 8cf07aabad08..a2b35e155852 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -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 @@ -102,7 +102,7 @@ AxisItemConverter::AxisItemConverter( m_pExplicitScale = new chart2::ExplicitScaleData( *pScale ); if( pIncrement ) m_pExplicitIncrement = new chart2::ExplicitIncrementData( *pIncrement ); - + m_aConverters.push_back( new GraphicPropertyItemConverter( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, @@ -324,12 +324,12 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS { //read only item //necessary tp display the crossing value with an appropriate format - + Reference< chart2::XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ) ); Reference< chart2::XAxis > xCrossingMainAxis( AxisHelper::getCrossingMainAxis( m_xAxis, xCooSys ) ); - + sal_Int32 nFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForAxis( xCrossingMainAxis, xCooSys, Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY ) ); @@ -401,9 +401,9 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI { if( !m_xAxis.is() ) return false; - + chart2::ScaleData aScale( m_xAxis->getScaleData() ); - + bool bSetScale = false; bool bChangedOtherwise = false; @@ -489,7 +489,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_REVERSE: { - bool bWasReverse = ( AxisOrientation_REVERSE == aScale.Orientation ); + bool bWasReverse = ( AxisOrientation_REVERSE == aScale.Orientation ); bool bNewReverse = (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ); if( bWasReverse != bNewReverse ) @@ -612,7 +612,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_POSITION: { - ::com::sun::star::chart::ChartAxisPosition eAxisPos = + ::com::sun::star::chart::ChartAxisPosition eAxisPos = (::com::sun::star::chart::ChartAxisPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -684,7 +684,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_LABEL_POSITION: { - ::com::sun::star::chart::ChartAxisLabelPosition ePos = + ::com::sun::star::chart::ChartAxisLabelPosition ePos = (::com::sun::star::chart::ChartAxisLabelPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -722,7 +722,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI case SCHATTR_AXIS_MARK_POSITION: { - ::com::sun::star::chart::ChartAxisMarkPosition ePos = + ::com::sun::star::chart::ChartAxisMarkPosition ePos = (::com::sun::star::chart::ChartAxisMarkPosition) static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -827,7 +827,7 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI if( bSetScale ) m_xAxis->setScaleData( aScale ); - + return (bSetScale || bChangedOtherwise); } diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 3382ae1ff085..6183703cc0a4 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -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 @@ -464,7 +464,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( try { if( rItem.QueryValue( aValue, MID_FONTHEIGHT ) ) - { + { bool bSetValue = false; if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix )) bSetValue = true; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 14590b6f6f9c..5cd14a4720dd 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -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 @@ -140,7 +140,7 @@ bool lcl_NumberFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet & if( bOverwriteAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( xPropertySet, uno::UNO_QUERY); - if( aValue != aOldValue || + if( aValue != aOldValue || ::chart::DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, aPropertyName, aOldValue ) ) { ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, aPropertyName, aValue ); @@ -187,7 +187,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet if( bOverwriteAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( xPropertySet, uno::UNO_QUERY); - if( aNewValue != aOldValue || + if( aNewValue != aOldValue || ::chart::DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, aPropertyName, aOldValue ) ) { ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, aPropertyName, aNewValue ); @@ -340,7 +340,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( bOldValue != rValue || + if( bOldValue != rValue || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "Label" ), aOldValue ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny( aLabel ) ); @@ -380,7 +380,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( !aOldValue.equals(aNewValue) || + if( !aOldValue.equals(aNewValue) || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aOldValue ) ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aNewValue ) ); @@ -402,7 +402,7 @@ bool DataPointItemConverter::ApplySpecialItem( case SCHATTR_DATADESCR_PLACEMENT: { - + try { sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); @@ -415,7 +415,7 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( nOld!=nNew || + if( nOld!=nNew || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nOld ) ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nNew ) ); @@ -563,7 +563,7 @@ void DataPointItemConverter::FillSpecialItem( (SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol )); rOutItemSet.Put( SfxBoolItem( nWhichId, bValue )); - + if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { if( DataSeriesHelper::hasAttributedDataPointDifferentValue( diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 0e2e6cdd4644..3a69b6c3ec88 100755 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index c732dfe80ede..837b7504fffc 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -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 @@ -323,7 +323,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( break; case XATTR_GRADIENTSTEPCOUNT: - if( lcl_supportsFillProperties( m_eGraphicObjectType )) + if( lcl_supportsFillProperties( m_eGraphicObjectType )) { ::rtl::OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 5ee167260974..b819ff18a531 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 3af6d9342f33..60ac4c9b86ca 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index e111eb314360..2516fa18d079 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -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 @@ -136,7 +136,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt ) { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); - uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties + uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, *aIt, -1/*nPointIndex*/, ChartModelHelper::findDiagram( xChartModel ) ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index e24be80bb429..c14a41b7f5c3 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 2fee8702e6d8..18e045ce578a 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 6035f21696a9..6ba4be5f2d70 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index f7ddeb42c11e..63bb9c0154cc 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -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,74 +56,74 @@ const USHORT nTitleWhichPairs[] = const USHORT nAxisWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx CHARACTER_WHICHPAIRS, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432 svx/svxids.hrc - SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx - SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx - SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx - SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx - SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx + SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx + SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx + SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; const USHORT nAllAxisWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx CHARACTER_WHICHPAIRS, - SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx - SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx - SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx - SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx + SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx + SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; const USHORT nGridWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; const USHORT nLegendWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx CHARACTER_WHICHPAIRS, - SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx + SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx 0 }; const USHORT nDataLabelWhichPairs[] = { SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ - SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ - SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR, 0 }; -#define CHART_POINT_WHICHPAIRS \ - XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ - XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ - EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 editeng/eeitem.hxx */ \ +#define CHART_POINT_WHICHPAIRS \ + XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ + XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ + EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 editeng/eeitem.hxx */ \ SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING, \ - SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ + SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ - SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ - SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, /* 40 sch/schattr.hxx*/ \ + SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /* 41 sch/schattr.hxx*/ \ SCHATTR_TEXT_DEGREES, SCHATTR_TEXT_DEGREES, \ - SCHATTR_STYLE_START,SCHATTR_STYLE_END, /* 59 - 68 sch/schattr.hxx*/ \ - SCHATTR_SYMBOL_BRUSH,SCHATTR_SYMBOL_BRUSH, /* 94 sch/schattr.hxx*/ \ - SCHATTR_SYMBOL_SIZE,SCHATTR_SYMBOL_SIZE, /* 97 sch/schattr.hxx*/ \ - SDRATTR_3D_FIRST, SDRATTR_3D_LAST /* 1244 - 1334 svx/svddef.hxx */ + SCHATTR_STYLE_START,SCHATTR_STYLE_END, /* 59 - 68 sch/schattr.hxx*/ \ + SCHATTR_SYMBOL_BRUSH,SCHATTR_SYMBOL_BRUSH, /* 94 sch/schattr.hxx*/ \ + SCHATTR_SYMBOL_SIZE,SCHATTR_SYMBOL_SIZE, /* 97 sch/schattr.hxx*/ \ + SDRATTR_3D_FIRST, SDRATTR_3D_LAST /* 1244 - 1334 svx/svddef.hxx */ const USHORT nDataPointWhichPairs[] = { @@ -132,7 +132,7 @@ const USHORT nDataPointWhichPairs[] = }; #define CHART_SERIES_OPTIONS_WHICHPAIRS \ - SCHATTR_AXIS,SCHATTR_AXIS, /* 69 sch/schattr.hxx*/ \ + SCHATTR_AXIS,SCHATTR_AXIS, /* 69 sch/schattr.hxx*/ \ SCHATTR_BAR_OVERLAP,SCHATTR_BAR_CONNECT, /* 98 - 100 (incl. SCHATTR_GAPWIDTH) */ \ SCHATTR_GROUP_BARS_PER_AXIS,SCHATTR_AXIS_FOR_ALL_SERIES, \ SCHATTR_STARTING_ANGLE,SCHATTR_STARTING_ANGLE, \ @@ -156,9 +156,9 @@ const USHORT nRowWhichPairs[] = const USHORT nAreaWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; @@ -166,7 +166,7 @@ const USHORT nTextWhichPairs[] = { CHARACTER_WHICHPAIRS, SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; @@ -174,21 +174,21 @@ const USHORT nTextOrientWhichPairs[] = { CHARACTER_WHICHPAIRS, SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx - SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; const USHORT nStatWhichPairs[]= { - SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx + SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 0 }; const USHORT nErrorBarWhichPairs[]= { - SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; @@ -202,22 +202,22 @@ const USHORT nCharacterPropertyWhichPairs[] = const USHORT nLinePropertyWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; const USHORT nFillPropertyWhichPairs[] = { - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; const USHORT nLineAndFillPropertyWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx 0 }; @@ -234,7 +234,7 @@ const USHORT nChartStyleWhichPairs[] = const USHORT nRegressionCurveWhichPairs[] = { SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx + XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx 0 }; @@ -244,7 +244,7 @@ const USHORT nRegEquationWhichPairs[] = XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx CHARACTER_WHICHPAIRS, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc 0 }; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index b1931d63cfbb..db5ceda4a16c 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -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 @@ -252,7 +252,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte } else if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) m_aBarPositionSequence[nAxisIndex] = rBarPosition; - + xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(m_aBarPositionSequence) ); bChanged = true; } @@ -316,7 +316,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte break; case SCHATTR_CLOCKWISE: - { + { bool bClockwise = (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ); if( m_xCooSys.is() ) diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index f2df5c96dd71..11a6db4c7f06 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -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/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index f745dd37e9c3..fa3e71dd9dfb 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -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/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index bf8afc65e78f..744727fab528 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -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 @@ -181,8 +181,8 @@ ChartController::TheModel::~TheModel() void ChartController::TheModel::SetOwnerShip( sal_Bool bGetsOwnership ) { - m_bOwnership = bGetsOwnership; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = bGetsOwnership; + m_bOwnershipIsWellKnown = sal_True; } void ChartController::TheModel::addListener( ChartController* pController ) @@ -234,8 +234,8 @@ void ChartController::TheModel::tryTermination() //so stop listening before trying to terminate or check the source of queryclosing event m_xCloseable->close(sal_True); - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; } catch( util::CloseVetoException& ) { @@ -247,8 +247,8 @@ void ChartController::TheModel::tryTermination() "INFO: a well known owner has catched a CloseVetoException after calling close(true)" ); #endif - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; return; } @@ -365,7 +365,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT throw(uno::RuntimeException) { ::vos::OGuard aGuard( Application::GetSolarMutex()); - + if( impl_isDisposedOrSuspended() ) //@todo? allow attaching the frame while suspended? return; //behave passive if already disposed or suspended @@ -411,7 +411,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT } { awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) ); - + // calls to VCL ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); m_pChartWindow = new ChartWindow(this,pParent,pParent?pParent->GetStyle():0); @@ -557,7 +557,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent aOldModelRef->removeListener( this ); //@todo?? termination correct? -// aOldModelRef->tryTermination(); +// aOldModelRef->tryTermination(); #ifdef TEST_ENABLE_MODIFY_LISTENER uno::Reference< util::XModifyBroadcaster > xMBroadcaster( aOldModelRef->getModel(),uno::UNO_QUERY ); if( xMBroadcaster.is()) @@ -623,7 +623,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XFrame > SAL_CALL ChartController -::getFrame() throw(uno::RuntimeException) +::getFrame() throw(uno::RuntimeException) { //provides access to owner frame of this controller //return the frame containing this controller @@ -632,7 +632,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XModel > SAL_CALL ChartController -::getModel() throw(uno::RuntimeException) +::getModel() throw(uno::RuntimeException) { //provides access to currently attached model //returns the currently attached model @@ -650,7 +650,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent { //provides access to current view status //set of data that can be used to restore the current view status at later time - // by using XController::restoreViewData() + // by using XController::restoreViewData() ::vos::OGuard aGuard( Application::GetSolarMutex()); if( impl_isDisposedOrSuspended() ) @@ -768,7 +768,7 @@ void ChartController::impl_deleteDrawViewController() if( !m_aLifeTimeManager.dispose() ) return; -// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); +// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); this->stopDoubleClickWaiting(); @@ -1070,7 +1070,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) return uno::Reference< frame::XDispatch > (); } - uno::Sequence > ChartController + uno::Sequence > ChartController ::queryDispatches( const uno::Sequence< frame::DispatchDescriptor>& xDescripts) throw(uno::RuntimeException) @@ -1275,12 +1275,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: add listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); -// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? -// return; //behave passive if already disposed or suspended +// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? +// return; //behave passive if already disposed or suspended -// //--add listener -// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); +// //--add listener +// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); } void SAL_CALL ChartController @@ -1289,12 +1289,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: remove listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// ::vos::OGuard aGuard( Application::GetSolarMutex()); // if( m_aLifeTimeManager.impl_isDisposed() ) -// return; //behave passive if already disposed or suspended +// return; //behave passive if already disposed or suspended -// //--remove listener -// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); +// //--remove listener +// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); } //----------------------------------------------------------------- @@ -1435,7 +1435,7 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) // the source can also be a subobject of the ChartModel // @todo: change the source in ChartModel to always be the model itself ? // if( getModel() == aEvent.Source ) - + //todo? update menu states ? } @@ -1546,7 +1546,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ( C2U("InsertMenuLegend") ) ( C2U("InsertLegend") ) ( C2U("DeleteLegend") ) ( C2U("InsertMenuDataLabels") ) ( C2U("InsertMenuAxes") ) ( C2U("InsertRemoveAxes") ) ( C2U("InsertMenuGrids") ) - ( C2U("InsertSymbol") ) + ( C2U("InsertSymbol") ) ( C2U("InsertTrendlineEquation") ) ( C2U("InsertTrendlineEquationAndR2") ) ( C2U("InsertR2Value") ) ( C2U("DeleteR2Value") ) ( C2U("InsertMenuTrendlines") ) ( C2U("InsertTrendline") ) @@ -1575,7 +1575,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn //context menu - format objects entries ( C2U("FormatWall") ) ( C2U("FormatFloor") ) ( C2U("FormatChartArea") ) ( C2U("FormatLegend") ) - + ( C2U("FormatAxis") ) ( C2U("FormatTitle") ) ( C2U("FormatDataSeries") ) ( C2U("FormatDataPoint") ) ( C2U("ResetAllDataPoints") ) ( C2U("ResetDataPoint") ) diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index f2b64eb7a9c5..c679714d212c 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -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 @@ -139,16 +139,16 @@ class DrawViewWrapper; class ViewElementListProvider; class ReferenceSizeProvider; -class ChartController : public ::cppu::WeakImplHelper12 < - ::com::sun::star::frame::XController //comprehends XComponent (required interface) - ,::com::sun::star::frame::XDispatchProvider //(required interface) - ,::com::sun::star::view::XSelectionSupplier //(optional interface) - ,::com::sun::star::ui::XContextMenuInterception //(optional interface) - ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) +class ChartController : public ::cppu::WeakImplHelper12 < + ::com::sun::star::frame::XController //comprehends XComponent (required interface) + ,::com::sun::star::frame::XDispatchProvider //(required interface) + ,::com::sun::star::view::XSelectionSupplier //(optional interface) + ,::com::sun::star::ui::XContextMenuInterception //(optional interface) + ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) ,::com::sun::star::lang::XServiceInfo - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::frame::XDispatch ,::com::sun::star::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent ,::com::sun::star::lang::XMultiServiceFactory @@ -188,13 +188,13 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException); + getFrame() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException); + getModel() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException); + getViewData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) @@ -208,7 +208,7 @@ public: // ::com::sun::star::lang::XComponent (base of XController) //----------------------------------------------------------------- virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< @@ -244,7 +244,7 @@ public: select( const ::com::sun::star::uno::Any& rSelection ) throw ( com::sun::star::lang::IllegalArgumentException ); - virtual ::com::sun::star::uno::Any SAL_CALL + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -338,7 +338,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException); + setFocus() throw (::com::sun::star::uno::RuntimeException); //---------------- virtual void SAL_CALL @@ -503,7 +503,7 @@ private: void acquire(); void release(); private: - sal_Int32 volatile m_nRefCount; + sal_Int32 volatile m_nRefCount; }; class TheModel : public RefCountable { @@ -513,24 +513,24 @@ private: virtual ~TheModel(); - void SetOwnerShip( sal_Bool bGetsOwnership ); - void addListener( ChartController* pController ); - void removeListener( ChartController* pController ); - void tryTermination(); + void SetOwnerShip( sal_Bool bGetsOwnership ); + void addListener( ChartController* pController ); + void removeListener( ChartController* pController ); + void tryTermination(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel() { return m_xModel;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; //the ownership between model and controller is not clear at first //each controller might consider himself as owner of the model first - sal_Bool volatile m_bOwnership; + sal_Bool volatile m_bOwnership; //with a XCloseable::close call and during XCloseListener::queryClosing //the ownership can be regulated more explicit, //if so the ownership is considered to be well known - sal_Bool volatile m_bOwnershipIsWellKnown; + sal_Bool volatile m_bOwnershipIsWellKnown; }; class TheModelRef { @@ -543,31 +543,31 @@ private: sal_Bool is() const; TheModel* operator->() const { return m_pTheModel; } private: - TheModel* m_pTheModel; - mutable ::osl::Mutex& m_rModelMutex; + TheModel* m_pTheModel; + mutable ::osl::Mutex& m_rModelMutex; }; private: - mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; + mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; - mutable ::osl::Mutex m_aControllerMutex; - sal_Bool volatile m_bSuspended; - sal_Bool volatile m_bCanClose; + mutable ::osl::Mutex m_aControllerMutex; + sal_Bool volatile m_bSuspended; + sal_Bool volatile m_bCanClose; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; //model - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - mutable ::osl::Mutex m_aModelMutex; - TheModelRef m_aModel; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + mutable ::osl::Mutex m_aModelMutex; + TheModelRef m_aModel; //view ChartWindow* m_pChartWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; - DrawViewWrapper* m_pDrawViewWrapper; + DrawViewWrapper* m_pDrawViewWrapper; Selection m_aSelection; SdrDragMode m_eDragMode; @@ -596,7 +596,7 @@ private: private: //private methods - sal_Bool impl_isDisposedOrSuspended() const; + sal_Bool impl_isDisposedOrSuspended() const; ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider(); void impl_adaptDataSeriesAutoResize(); @@ -708,7 +708,7 @@ private: ::std::set< ::rtl::OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For - parameters see + parameters see The returned object should not be used directly. Instead a proxy object should use this helper to retrieve its children and add them to its own diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 0248732a63a7..6026345080cb 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -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/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 0a7a4057ef9a..b5e3cc04bf97 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -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 @@ -297,7 +297,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() ObjectIdentifier::getSeriesParticleFromCID(m_aSelection.getSelectedCID()), aChildParticle ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); return; } @@ -706,7 +706,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_LABEL )))), m_xUndoManager, getModel() ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); @@ -756,7 +756,7 @@ void ChartController::executeDispatch_ResetDataPoint() { sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( m_aSelection.getSelectedCID() ); xSeries->resetDataPoint( nPointIndex ); - } + } aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 619d308ffad2..0779306832d0 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -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 @@ -86,13 +86,13 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r switch( eRP ) { - case RP_LT: + case RP_LT: break; case RP_MT: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; + nPosX += ( aOriginalSize.Width - nSizX ) / 2; break; case RP_RT: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; break; case RP_LM: nPosY += ( aOriginalSize.Height - nSizY ) / 2; @@ -113,7 +113,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r nPosY += aOriginalSize.Height - nSizY; break; case RP_RB: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; nPosY += aOriginalSize.Height - nSizY; break; default: @@ -157,7 +157,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ); DBG_ASSERT( pDlg, "Couldn't create SchTransformTabDialog" ); - + if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 649b9cb62f9d..227946cd2d66 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -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 @@ -243,7 +243,7 @@ namespace sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, xSeries, nPointIndex, xDiagram ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( xObjectProperties,uno::Reference< util::XNumberFormatsSupplier >(xChartModel, uno::UNO_QUERY)); - + pItemConverter = new wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, xSeries, rDrawModel.GetItemPool(), rDrawModel, pNumberFormatterWrapper, @@ -355,7 +355,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, nTitleType = TitleHelper::SECONDARY_X_AXIS_TITLE; else if( rDispatchCommand.equals("SecondaryYTitle") ) nTitleType = TitleHelper::SECONDARY_Y_AXIS_TITLE; - + uno::Reference< XTitle > xTitle( TitleHelper::getTitle( nTitleType, xChartModel ) ); return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ); } @@ -373,7 +373,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisY")) { - nDimensionIndex=1; bMainAxis=true; + nDimensionIndex=1; bMainAxis=true; } else if( rDispatchCommand.equals("DiagramAxisZ")) { @@ -385,7 +385,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisB")) { - nDimensionIndex=1; bMainAxis=false; + nDimensionIndex=1; bMainAxis=false; } uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); @@ -578,7 +578,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand return rSelectedCID; else return ObjectIdentifier::createDataCurveCID( - ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), + ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } @@ -627,7 +627,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( rSelectedCID, xChartModel ); return ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel ); } - + } //------------------------------------------------------------------------- // minor grid @@ -723,7 +723,7 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin m_xUndoManager, getModel() ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, false ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index a6e82430d8f6..9e1c003abd10 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -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 @@ -206,7 +206,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() //set fixed current font aSet.Put( SfxBoolItem( FN_PARAM_2, TRUE ) ); //maybe not necessary in future - + Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont(); aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index ffe752f43a7a..5ce82dec7e52 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -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 @@ -124,7 +124,7 @@ bool lcl_deleteDataSeries( ::chart::DataSeriesHelper::deleteSeries( xSeries, xChartType ); ::chart::AxisHelper::hideAxisIfNoDataIsAttached( xAxis, xDiagram ); - + bResult = true; aUndoGuard.commitAction(); } @@ -210,7 +210,7 @@ namespace chart awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); return ::std::auto_ptr< ReferenceSizeProvider >( - new ReferenceSizeProvider( aPageSize, + new ReferenceSizeProvider( aPageSize, Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ))); } @@ -247,7 +247,7 @@ void ChartController::executeDispatch_NewArrangement() // 3d rotation ThreeDHelper::set3DSettingsToDefault( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ) ); - + // legend Reference< beans::XPropertyState > xLegendState( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendState.is()) @@ -827,16 +827,14 @@ bool ChartController::executeDispatch_Delete() else { //remove additional shape - uno::Reference< drawing::XShape > xShape( m_aSelection.getSelectedAdditionalShape() ); - if( xShape.is() ) + impl_ClearSelection(); { - impl_ClearSelection(); + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + if ( m_pDrawViewWrapper ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - if( m_pDrawViewWrapper ) - m_pDrawViewWrapper->UnmarkAll(); + m_pDrawViewWrapper->DeleteMarked(); + bReturn = true; } - bReturn = DrawModelWrapper::removeShape( xShape ); } } return bReturn; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 56908ac4ef79..dfc25bd4bad5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -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 @@ -88,7 +88,7 @@ #include #include -#define DRGPIX 2 // Drag MinMove in Pixel +#define DRGPIX 2 // Drag MinMove in Pixel using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -336,7 +336,7 @@ const short HITPIX=2; //hit-tolerance in pixel } void SAL_CALL ChartController -::setFocus() throw (uno::RuntimeException) +::setFocus() throw (uno::RuntimeException) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -620,7 +620,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper ) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if ( MOUSE_LEFT == rMEvt.GetButtons() ) { @@ -654,7 +654,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if( isDoubleClick(rMEvt) ) //do not change selection if double click return;//double click is handled further in mousebutton up - + SdrHdl* pHitSelectionHdl = 0; //switch from move to resize if handle is hit on a resizeable object if( m_aSelection.isResizeableObjectSelected() ) @@ -697,7 +697,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) m_aSelection.adaptSelectionToNewPos( aMPos, pDrawViewWrapper , rMEvt.IsRight(), m_bWaitingForDoubleClick ); - + if( !m_aSelection.isRotateableObjectSelected( getModel() ) ) { m_eDragMode = SDRDRAG_MOVE; @@ -766,8 +766,8 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt ) pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); } - //?? pDrawViewWrapper->GetPageView()->DragPoly(); - + //?? pDrawViewWrapper->GetPageView()->DragPoly(); + impl_SetMousePointer( rMEvt ); } void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ ) @@ -790,7 +790,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if(pDrawViewWrapper->IsTextEdit()) { @@ -867,7 +867,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::MOVE); if( !bIsMoveOnly && m_aSelection.isResizeableObjectSelected() ) eActionType = ActionDescriptionProvider::RESIZE; - + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( eActionType, @@ -896,13 +896,13 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) { bool bClickedTwiceOnDragableObject = SelectionHelper::isDragableObjectHitTwice( aMPos, m_aSelection.getSelectedCID(), *pDrawViewWrapper ); bool bIsRotateable = m_aSelection.isRotateableObjectSelected( getModel() ); - + //toggel between move and rotate if( bIsRotateable && bClickedTwiceOnDragableObject && SDRDRAG_MOVE==m_eDragMode ) m_eDragMode=SDRDRAG_ROTATE; else m_eDragMode=SDRDRAG_MOVE; - + pDrawViewWrapper->SetDragMode(m_eDragMode); if( !m_bWaitingForDoubleClick && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() ) @@ -1027,7 +1027,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) else { // todo: the context menu should be specified by an xml file in uiconfig - uno::Reference< awt::XPopupMenu > xPopupMenu( + uno::Reference< awt::XPopupMenu > xPopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY ); @@ -1048,7 +1048,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); uno::Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); Reference< chart2::XRegressionCurve > xTrendline( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xCurveCnt ) ); - bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); + bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) ); bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true ); bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries ); @@ -1126,7 +1126,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ASSERT_EXCEPTION( ex ); } } - + if( bHasDataLabelsAtSeries ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") ); if( xTrendline.is() ) @@ -1175,9 +1175,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) //if( nIdBeforeDelete != nUniqueId ) xPopupMenu->insertSeparator( -1 ); - + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow")); - uno::Reference< awt::XPopupMenu > xArrangePopupMenu( + uno::Reference< awt::XPopupMenu > xArrangePopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY ); @@ -1225,7 +1225,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XTitled > xTitled( xAxis, uno::UNO_QUERY ); if( xTitled.is()) bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0; - + if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") ); if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis ) @@ -1271,12 +1271,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") ); if( !bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); if( bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") ); } //----- - + xPopupMenu->insertSeparator( -1 ); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType")); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges")); @@ -1510,7 +1510,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) aPos.Y = aPageSize.Height - aSize.Height; if( aPos.Y < 0 ) aPos.Y = 0; - + xShape->setPosition( aPos ); } } @@ -1889,7 +1889,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( pHitSelectionHdl ) { - + Pointer aPointer = m_pDrawViewWrapper->GetPreferedPointer( aMousePos, pWindow, nModifier, bLeftDown ); bool bForceArrowPointer = false; @@ -1934,7 +1934,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if ( m_eDrawMode == CHARTDRAW_INSERT && ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) ) { - PointerStyle ePointerStyle = POINTER_DRAW_RECT; + PointerStyle ePointerStyle = POINTER_DRAW_RECT; SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() ); switch ( eKind ) { diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 8749ca1bc062..d000b3071e1e 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -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/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index 2de9c0c72663..e9d226bcd1bb 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -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 @@ -57,7 +57,7 @@ private: ChartDropTargetHelper(); bool satisfiesPrerequisites() const; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index cab3816d5033..ecd8f0422d66 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -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 @@ -91,7 +91,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT { //@todo ? need to add as terminate listener to desktop? - uno::Reference< frame::XModel > xModel; + uno::Reference< frame::XModel > xModel; bool bHaveLoadedModel = false; comphelper::MediaDescriptor aMediaDescriptor(rMediaDescriptor); @@ -118,8 +118,8 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } //create the controller(+XWindow) - uno::Reference< frame::XController > xController = NULL; - uno::Reference< awt::XWindow > xComponentWindow = NULL; + uno::Reference< frame::XController > xController = NULL; + uno::Reference< awt::XWindow > xComponentWindow = NULL; { xController = uno::Reference< frame::XController >( m_xCC->getServiceManager()->createInstanceWithContext( diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 8b6e1e0a3225..60ae0423f650 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -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 @@ -43,15 +43,15 @@ class ChartFrameLoader : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader , ::com::sun::star::lang::XServiceInfo //comprehends XComponent (required interface) - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; - sal_Bool m_bCancelRequired; - ::osl::Condition m_oCancelFinished; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + sal_Bool m_bCancelRequired; + ::osl::Condition m_oCancelFinished; private: sal_Bool impl_checkCancel(); @@ -81,7 +81,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException); + cancel() throw (::com::sun::star::uno::RuntimeException); }; //............................................................................. diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx index 3419f7a53bec..a5fdde5c08a1 100644 --- a/chart2/source/controller/main/ChartRenderer.cxx +++ b/chart2/source/controller/main/ChartRenderer.cxx @@ -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 @@ -90,7 +90,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject // get the chart view Reference< lang::XUnoTunnel > xChartView( xFact->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); - + try { //better performance for big data @@ -121,7 +121,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject return false; ::boost::shared_ptr< DrawViewWrapper > pDrawViewWrapper( new DrawViewWrapper(&pDrawModelWrapper->getSdrModel(),pOutDev,false) ); pDrawViewWrapper->attachParentReferenceDevice( xModel ); - + MapMode aOldMapMode( pOutDev->GetMapMode() ); Point aOldOrigin( aOldMapMode.GetOrigin() ); MapMode aMapMode( aOldMapMode ); @@ -130,7 +130,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject aMapMode.SetOrigin( aOldOriginMM + aObjectTopLeftMM ); aMapMode.SetMapUnit( MAP_100TH_MM ); pOutDev->SetMapMode(aMapMode); - + Rectangle aPaintRect( OutputDevice::LogicToLogic( rLogicObjectRect, aOldMapMode, aMapMode ) ); pDrawViewWrapper->CompleteRedraw(pOutDev, Region(aPaintRect) ); diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 80041d4c3818..1ab1bc2999b0 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -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/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index 401f43c6d1ae..667b137abf89 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -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/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 240b615cf0f6..1f077b301948 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -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/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 2325d6be7803..812dc2438a80 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -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/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index bd040fce8fff..d527d7e52ac7 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -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/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 08140786ac4e..488cb6edcd39 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -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/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index e0d689340760..019d6b8392ba 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -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 @@ -70,7 +70,7 @@ void CommandDispatchContainer::setModel( { // remove all existing dispatcher that base on the old model m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xModel = xModel; } @@ -174,7 +174,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche void CommandDispatchContainer::DisposeAndClear() { m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xChartDispatcher.clear(); m_aChartCommands.clear(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 1c8769e0a6d9..32b136cd8fb2 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -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/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index bf0bc6e14eec..60258054762d 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -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/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index a01b80bfa22b..c62de3dfe211 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -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/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 08d57a0d6cbf..943a3e760fa8 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -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/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 11ba7b7b8016..c61339272ac6 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -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/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index dfd5cfa20255..e298cb384b88 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -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/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 5074147fa9e2..d5f6d1f68ffa 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -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 @@ -106,7 +106,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt) m_fAdditionalOffset = -m_fInitialOffset; else if( m_fAdditionalOffset > (1.0-m_fInitialOffset) ) m_fAdditionalOffset = 1.0 - m_fInitialOffset; - + B2DVector aNewPosVector = m_aStartVector + (m_aDragDirection * m_fAdditionalOffset); Point aNewPos = Point( (long)(aNewPosVector.getX()), (long)(aNewPosVector.getY()) ); if( aNewPos != DragStat().GetNow() ) diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index f63af9be3cc4..5e52749abd8c 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -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/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 944b44dd25bf..56d089481021 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -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 @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_chart2.hxx" #include "DragMethod_RotateDiagram.hxx" @@ -94,11 +94,11 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr { ThreeDHelper::getRotationFromDiagram( xDiagramProperties , m_nInitialHorizontalAngleDegree, m_nInitialVerticalAngleDegree ); - + ThreeDHelper::getRotationAngleFromDiagram( xDiagramProperties , m_fInitialXAngleRad, m_fInitialYAngleRad, m_fInitialZAngleRad ); - - if( ChartTypeHelper::isSupportingRightAngledAxes( + + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) xDiagramProperties->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; if(m_bRightAngledAxes) @@ -213,7 +213,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY ); aCurrentTransform.shearXY(fResultY,-(fResultX)); } - + if(m_aWireframePolyPolygon.count() && m_pScene) { const sdr::contact::ViewContactOfE3dScene& rVCScene = static_cast< sdr::contact::ViewContactOfE3dScene& >(m_pScene->GetViewContact()); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index b16e12fe5359..ba9ed1125f34 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -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 @@ -49,7 +49,7 @@ public: DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper , const rtl::OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , RotationDirection eRotationDirection + , RotationDirection eRotationDirection ); virtual ~DragMethod_RotateDiagram(); @@ -67,7 +67,7 @@ private: Rectangle m_aReferenceRect; Point m_aStartPos; basegfx::B3DPolyPolygon m_aWireframePolyPolygon; - + double m_fInitialXAngleRad; double m_fInitialYAngleRad; double m_fInitialZAngleRad; @@ -75,7 +75,7 @@ private: double m_fAdditionalXAngleRad; double m_fAdditionalYAngleRad; double m_fAdditionalZAngleRad; - + sal_Int32 m_nInitialHorizontalAngleDegree; sal_Int32 m_nInitialVerticalAngleDegree; diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index aa28028c4861..cd893672adf4 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -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 @@ -398,7 +398,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen const beans::PropertyValue* pKeyModifier = ::std::find_if( pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) ); sal_Int16 nKeyModifier = 0; - if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) + if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) { if ( eDrawMode == CHARTDRAW_INSERT ) { diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc index 4e31fafaaf63..66a729498d71 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.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 diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 38c886e29abb..a1e54f01b894 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -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/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 3b41fd1b6b66..210a26294aa1 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -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 @@ -114,7 +114,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); aSelectedCID = aSelectedOID.getObjectCID(); } - + Reference< chart2::XChartDocument > xChartDoc( xChartController->getModel(), uno::UNO_QUERY ); ObjectType eType( aSelectedOID.getObjectType() ); bool bAddSelectionToList = false; @@ -318,7 +318,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } // ----------------------------------------------------------------------------- -uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) +uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xItemWindow; diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index d85415d614e2..3110e0ee28bd 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -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 @@ -42,7 +42,7 @@ namespace chart { //............................................................................. - + struct ListBoxEntryData { rtl::OUString UIName; @@ -106,13 +106,13 @@ public: virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); // XToolbarController virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); - + private: //no default constructor ElementSelectorToolbarController(){} private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; }; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 39b4e1d4a171..0dbbc762f15d 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -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/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index b3e2a568d3b9..6dd610e0b876 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -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 @@ -98,7 +98,7 @@ protected: the command group of the feature. This is important for configuring the controller UI by the user, see also CommandGroup. */ - void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, + void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, sal_Int16 nGroup = ::com::sun::star::frame::CommandGroup::INTERNAL ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx index 57e8e7315334..c22d54f9cbbe 100644 --- a/chart2/source/controller/main/ImplUndoManager.cxx +++ b/chart2/source/controller/main/ImplUndoManager.cxx @@ -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/chart2/source/controller/main/ImplUndoManager.hxx b/chart2/source/controller/main/ImplUndoManager.hxx index 4dde0bc65719..ad40bf87aeaa 100644 --- a/chart2/source/controller/main/ImplUndoManager.hxx +++ b/chart2/source/controller/main/ImplUndoManager.hxx @@ -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/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index fe73d15500f5..372b8cfa77e4 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -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 @@ -249,7 +249,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) ); for( sal_Int32 i=0; i0 && !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, nDimensionIndex ) ) continue; - + if( m_bOrderingForElementSelector ) { // axis diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index f0ce3eaaa04e..b57f1add2018 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -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/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 567a36473a5b..1e1e407951de 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -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 @@ -65,7 +65,7 @@ rtl::OUString lcl_getObjectName( SdrObject* pObj ) void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + if(pObjectToSelect) { SelectionHelper aSelectionHelper( pObjectToSelect ); @@ -183,13 +183,13 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* { if( pDrawViewWrapper ) { - //do not toggel multiclick selection if right clicked on the selected object or waiting for double click + //do not toggel multiclick selection if right clicked on the selected object or waiting for double click bool bAllowMultiClickSelectionChange = !bIsRightMouse && !bWaitingForDoubleClick; ObjectIdentifier aLastSelectedObject( m_aSelectedOID ); ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + //bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point) //get object to select: @@ -452,7 +452,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos else if( bGetDiagramInsteadOf_Wall ) { rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model - + if( aRet.equals( aWallCID ) ) { rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); @@ -473,7 +473,7 @@ bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID return false; sal_Int32 nDimensionCount = DiagramHelper::getDimension( ChartModelHelper::findDiagram( xChartModel ) ); - + if( nDimensionCount == 3 ) return true; return false; @@ -558,7 +558,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) { //search wether the object or one of its children is a 3D object //if so, return the accessory 3DScene - + E3dObject* pRotateable = 0; if(pObj) @@ -579,7 +579,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) } } } - + E3dScene* pScene = 0; if(pRotateable) { diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index b3516e2326a4..a6904cf1af3c 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -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/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index b6adf9bf7477..61527c2918d3 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -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/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index aea01d6c478d..53436802e9d8 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -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/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 9c6ed747e1d5..913c1bf6da61 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -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 @@ -191,7 +191,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments // ::com::sun::star::frame::XStatusListener void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) { @@ -234,7 +234,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); Reference< awt::XWindow > xRet; if ( m_pToolbarController.is() ) @@ -259,7 +259,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno ::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { @@ -272,7 +272,7 @@ void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); - + uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 544cac7f9831..a8bfe954809b 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -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 @@ -43,7 +43,7 @@ namespace chart { //............................................................................. -typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, +typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base; typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::star::frame::XToolbarController > TToolbarHelper; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index d80d37eff7da..00cc9a84417e 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -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/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index c84f81f83258..93e1f951c97d 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -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/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index eb3d00a2723a..bb6034f882fd 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -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/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 28fb813f63de..680be0462a52 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -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/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 8513b6ba9093..d26e9adb6ed8 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -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/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx index 21e27922b1c8..45e6c3e8b37f 100644 --- a/chart2/source/controller/main/UndoManager.cxx +++ b/chart2/source/controller/main/UndoManager.cxx @@ -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/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index cf8f5525e624..6dd12e6429a2 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -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/chart2/source/controller/menus/ShapeContextMenu.src b/chart2/source/controller/menus/ShapeContextMenu.src index 79e424707807..281668b3652a 100644 --- a/chart2/source/controller/menus/ShapeContextMenu.src +++ b/chart2/source/controller/menus/ShapeContextMenu.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 @@ -76,7 +76,7 @@ Menu RID_CONTEXTMENU_SHAPE Command = ".uno:ArrangeRow"; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -98,7 +98,7 @@ Menu RID_CONTEXTMENU_SHAPE Identifier = COMMAND_ID_SEND_TO_BACK; Command = ".uno:SendToBack"; }; - }; + }; }; }; MenuItem diff --git a/chart2/source/controller/menus/ShapeEditContextMenu.src b/chart2/source/controller/menus/ShapeEditContextMenu.src index 60f5d4eab5af..6206f575d9a1 100644 --- a/chart2/source/controller/menus/ShapeEditContextMenu.src +++ b/chart2/source/controller/menus/ShapeEditContextMenu.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 diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 75e69436a784..aeabb9dae355 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -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 @@ -80,7 +80,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = 0 ); - + static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); @@ -107,7 +107,7 @@ public: SAL_DLLPRIVATE static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties ); static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); static sal_Bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); - + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > getCoordinateSystemByIndex( @@ -197,7 +197,7 @@ public: ::com::sun::star::chart2::XCoordinateSystem >& xCooSys , bool bOnlyVisible = false ); - static ::com::sun::star::uno::Sequence< + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > getAllGrids( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/AxisIndexDefines.hxx b/chart2/source/inc/AxisIndexDefines.hxx index d994f8a85ea4..34a4c9b021b1 100644 --- a/chart2/source/inc/AxisIndexDefines.hxx +++ b/chart2/source/inc/AxisIndexDefines.hxx @@ -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/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 384841261073..ac130e430505 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -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/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 2ad418939945..c64b2ffc35e2 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -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 @@ -143,7 +143,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) + virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); // diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index 0742435e9bfe..7bca5d49ef32 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -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/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx index d31267f9cfc4..d4b2fd8ff0e5 100644 --- a/chart2/source/inc/ChartDebugTrace.hxx +++ b/chart2/source/inc/ChartDebugTrace.hxx @@ -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/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index fb087abf15fd..758b4c68369a 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -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/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 729cfc86bc52..2a435b811e54 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -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/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 772841418e45..18c9e0b00e0e 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -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/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index 6747bd614d84..a1158546409c 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -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/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index af49918a1154..8feca6e6b16e 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -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/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 1ce032b3af69..ae448623872a 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -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 @@ -267,7 +267,7 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); - + OOO_DLLPUBLIC_CHARTTOOLS bool replaceParamterInString( rtl::OUString & rInOutResourceString, const rtl::OUString & rParamToReplace, diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 13435741e63e..1d0f8cf93fba 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -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/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 56d13f8971c1..3953e041a39a 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -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/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx index 9ddde49908c2..1e60fe592a74 100644 --- a/chart2/source/inc/ConfigItemListener.hxx +++ b/chart2/source/inc/ConfigItemListener.hxx @@ -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/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index 4c6d10d6b1f0..fdb5cbc9f109 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -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/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 69044d4a2b3f..d3101efbe3f9 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -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/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 640d5cd70dec..90e54fd099ae 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -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/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 3dd6ff72d330..0025151411f4 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -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/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 06888fe858d6..79954399f465 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -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 @@ -59,7 +59,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createCachedDataSequence(); - + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createCachedDataSequence( const ::rtl::OUString & rSingleText ); diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index c7cda6189680..b65797a95551 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -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 @@ -104,7 +104,7 @@ public: static StackMode getStackMode( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, - bool& rbFound, bool& rbAmbiguous + bool& rbFound, bool& rbAmbiguous ); /** @param bOnlyAtFirstChartType @@ -123,7 +123,7 @@ public: /** Retrieves the stackmode of the first DataSeries or none. If the series have differing stack modes, rbAmbiguous is set to true. If no series is there rbFound is set to false. - + @param xCorrespondingCoordinateSystem The coordinate system in which the given chart type xChartType is located. (This is needed for determining percent stacking. If diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx index 7e8932f17581..72c854390048 100644 --- a/chart2/source/inc/DisposeHelper.hxx +++ b/chart2/source/inc/DisposeHelper.hxx @@ -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/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index f4d2b457acc4..cbb3d7bffe76 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -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/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 79840a2bd2e4..1efba6c07e57 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -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/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 18d54eb6e2ad..4601c1a416a6 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -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/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index 91c3034ea79c..533d3e714740 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -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/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx index d0651d60f923..0739d5d96750 100644 --- a/chart2/source/inc/FastPropertyIdRanges.hxx +++ b/chart2/source/inc/FastPropertyIdRanges.hxx @@ -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/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index f9fa970828a2..66fdb5f9098d 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -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/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index a0e69011f77d..6312399d3175 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -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/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 6b6590cffdac..314bb2e18b36 100755 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -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 @@ -58,7 +58,7 @@ public: ::std::vector< ::rtl::OUString > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; ::std::vector< ::rtl::OUString > getComplexRowLabel( sal_Int32 nRowIndex ) const; - + void swapRowWithNext( sal_Int32 nRowIndex ); void swapColumnWithNext( sal_Int32 nColumnIndex ); diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index f5e12f87f505..ccc35d734c6e 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -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 @@ -148,7 +148,7 @@ public: const ::rtl::OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XComplexDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); @@ -158,7 +158,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); @@ -197,7 +197,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) + virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); private: diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index a5ec1d99307d..73d762f8ef5c 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -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/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index 5f8279286b72..460b8e045b2c 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -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/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 8e278168259f..7c23a1286f5b 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -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 @@ -47,84 +47,84 @@ class LifeTimeManager { friend class LifeTimeGuard; protected: - mutable ::osl::Mutex m_aAccessMutex; + mutable ::osl::Mutex m_aAccessMutex; public: -OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); -OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager(); -OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposed( bool bAssert=true ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposed( bool bAssert=true ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); public: - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; protected: - virtual sal_Bool impl_canStartApiCall(); - virtual void impl_apiCallCountReachedNull(){} + virtual sal_Bool impl_canStartApiCall(); + virtual void impl_apiCallCountReachedNull(){} - void impl_registerApiCall(sal_Bool bLongLastingCall); - void impl_unregisterApiCall(sal_Bool bLongLastingCall); + void impl_registerApiCall(sal_Bool bLongLastingCall); + void impl_unregisterApiCall(sal_Bool bLongLastingCall); - void impl_init(); + void impl_init(); protected: - ::com::sun::star::lang::XComponent* m_pComponent; + ::com::sun::star::lang::XComponent* m_pComponent; - ::osl::Condition m_aNoAccessCountCondition; - sal_Int32 volatile m_nAccessCount; + ::osl::Condition m_aNoAccessCountCondition; + sal_Int32 volatile m_nAccessCount; - sal_Bool volatile m_bDisposed; - sal_Bool volatile m_bInDispose; + sal_Bool volatile m_bDisposed; + sal_Bool volatile m_bInDispose; // - sal_Bool m_bLongLastingCallsCancelable; - ::osl::Condition m_aNoLongLastingCallCountCondition; - sal_Int32 volatile m_nLongLastingCallCount; + sal_Bool m_bLongLastingCallsCancelable; + ::osl::Condition m_aNoLongLastingCallCountCondition; + sal_Int32 volatile m_nLongLastingCallCount; }; class CloseableLifeTimeManager : public LifeTimeManager { protected: - ::com::sun::star::util::XCloseable* m_pCloseable; + ::com::sun::star::util::XCloseable* m_pCloseable; - ::osl::Condition m_aEndTryClosingCondition; - sal_Bool volatile m_bClosed; - sal_Bool volatile m_bInTryClose; + ::osl::Condition m_aEndTryClosingCondition; + sal_Bool volatile m_bClosed; + sal_Bool volatile m_bInTryClose; //the ownership between model and controller is not clear at first //each controller might consider him as owner of the model first //at start the model is not considered as owner of itself - sal_Bool volatile m_bOwnership; + sal_Bool volatile m_bOwnership; //with a XCloseable::close call and during XCloseListener::queryClosing //the ownership can be regulated more explicit, //if so the ownership is considered to be well known - sal_Bool volatile m_bOwnershipIsWellKnown; + sal_Bool volatile m_bOwnershipIsWellKnown; public: -OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable +OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable , ::com::sun::star::lang::XComponent* pComponent , sal_Bool bLongLastingCallsCancelable = sal_False ); -OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); -OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) +OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) throw ( ::com::sun::star::uno::Exception ); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) throw ( ::com::sun::star::util::CloseVetoException ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); -OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) throw(::com::sun::star::uno::RuntimeException); protected: - virtual sal_Bool impl_canStartApiCall(); - virtual void impl_apiCallCountReachedNull(); + virtual sal_Bool impl_canStartApiCall(); + virtual void impl_apiCallCountReachedNull(); - void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); - sal_Bool impl_shouldCloseAtNextChance(); - void impl_doClose(); + void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); + sal_Bool impl_shouldCloseAtNextChance(); + void impl_doClose(); - void impl_init() + void impl_init() { m_bClosed = sal_False; m_bInTryClose = sal_False; @@ -216,9 +216,9 @@ public: private: osl::ClearableMutexGuard m_guard; - LifeTimeManager& m_rManager; - sal_Bool m_bCallRegistered; - sal_Bool m_bLongLastingCallRegistered; + LifeTimeManager& m_rManager; + sal_Bool m_bCallRegistered; + sal_Bool m_bLongLastingCallRegistered; private: // these make no sense diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx index 15cd08654a46..4437a031f8f2 100644 --- a/chart2/source/inc/LineProperties.hxx +++ b/chart2/source/inc/LineProperties.hxx @@ -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/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index faef7bdbe0c8..1aadd77b0bf1 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -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/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 4b3a6fa8d0b0..39856e843c16 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -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/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 3fc2c6f1c354..806aceb8ffff 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -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/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index a41ad1f8c751..461da439487b 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -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 @@ -87,101 +87,101 @@ public: //@todo define this for debug only, except URL - sal_Bool AsTemplate; //document is a template. - sal_Bool ISSET_AsTemplate; - ::rtl::OUString Author; // - sal_Bool ISSET_Author; - ::rtl::OUString CharacterSet; //identifier of used character set. - sal_Bool ISSET_CharacterSet; - ::rtl::OUString Comment;// - sal_Bool ISSET_Comment; + sal_Bool AsTemplate; //document is a template. + sal_Bool ISSET_AsTemplate; + ::rtl::OUString Author; // + sal_Bool ISSET_Author; + ::rtl::OUString CharacterSet; //identifier of used character set. + sal_Bool ISSET_CharacterSet; + ::rtl::OUString Comment;// + sal_Bool ISSET_Comment; ::com::sun::star::uno::Any ComponentData;// - sal_Bool ISSET_ComponentData; - ::rtl::OUString FileName; //deprecated, same as url - sal_Bool ISSET_FileName; + sal_Bool ISSET_ComponentData; + ::rtl::OUString FileName; //deprecated, same as url + sal_Bool ISSET_FileName; ::com::sun::star::uno::Any FilterData;// - sal_Bool ISSET_FilterData; - ::rtl::OUString FilterName; //internal filter name. - sal_Bool ISSET_FilterName; - ::rtl::OUString FilterFlags;//deprecated, - sal_Bool ISSET_FilterFlags; - ::rtl::OUString FilterOptions;// - sal_Bool ISSET_FilterOptions; + sal_Bool ISSET_FilterData; + ::rtl::OUString FilterName; //internal filter name. + sal_Bool ISSET_FilterName; + ::rtl::OUString FilterFlags;//deprecated, + sal_Bool ISSET_FilterFlags; + ::rtl::OUString FilterOptions;// + sal_Bool ISSET_FilterOptions; //not documented ... @todo remove? - ::rtl::OUString FrameName; //name of target frame. - sal_Bool ISSET_FrameName; - sal_Bool Hidden; //load document, invisible. - sal_Bool ISSET_Hidden; + ::rtl::OUString FrameName; //name of target frame. + sal_Bool ISSET_FrameName; + sal_Bool Hidden; //load document, invisible. + sal_Bool ISSET_Hidden; - ::rtl::OUString HierarchicalDocumentName; - sal_Bool ISSET_HierarchicalDocumentName; + ::rtl::OUString HierarchicalDocumentName; + sal_Bool ISSET_HierarchicalDocumentName; ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OutputStream; //a stream to receive the document data for saving - sal_Bool ISSET_OutputStream; + sal_Bool ISSET_OutputStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > InputStream; //content of document. - sal_Bool ISSET_InputStream; + sal_Bool ISSET_InputStream; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - InteractionHandler; // //::com::sun::star::task::XInteractionHandler - sal_Bool ISSET_InteractionHandler; - - ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. - sal_Bool ISSET_JumpMark; - ::rtl::OUString MediaType; //mime type. - sal_Bool ISSET_MediaType; - ::rtl::OUString OpenFlags; //deprecated - sal_Bool ISSET_OpenFlags; - sal_Bool OpenNewView; //opens a new view for an already loaded document. - sal_Bool ISSET_OpenNewView; - sal_Bool Overwrite; //opens a new view for an already loaded document. - sal_Bool ISSET_Overwrite; - ::rtl::OUString Password; // - sal_Bool ISSET_Password; + InteractionHandler; // //::com::sun::star::task::XInteractionHandler + sal_Bool ISSET_InteractionHandler; + + ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. + sal_Bool ISSET_JumpMark; + ::rtl::OUString MediaType; //mime type. + sal_Bool ISSET_MediaType; + ::rtl::OUString OpenFlags; //deprecated + sal_Bool ISSET_OpenFlags; + sal_Bool OpenNewView; //opens a new view for an already loaded document. + sal_Bool ISSET_OpenNewView; + sal_Bool Overwrite; //opens a new view for an already loaded document. + sal_Bool ISSET_Overwrite; + ::rtl::OUString Password; // + sal_Bool ISSET_Password; //not documented ... @todo remove? ::com::sun::star::awt::Rectangle PosSize; //position and size of document window. - sal_Bool ISSET_PosSize; + sal_Bool ISSET_PosSize; ::com::sun::star::uno::Sequence< sal_Int8 > PostData; //contains the data for HTTP post method as a sequence of bytes. - sal_Bool ISSET_PostData; - ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. - sal_Bool ISSET_PostString; - sal_Bool Preview; //show preview. - sal_Bool ISSET_Preview; - sal_Bool ReadOnly; //open document readonly. - sal_Bool ISSET_ReadOnly; - ::rtl::OUString Referer; //name of document referrer. - sal_Bool ISSET_Referer; + sal_Bool ISSET_PostData; + ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. + sal_Bool ISSET_PostString; + sal_Bool Preview; //show preview. + sal_Bool ISSET_Preview; + sal_Bool ReadOnly; //open document readonly. + sal_Bool ISSET_ReadOnly; + ::rtl::OUString Referer; //name of document referrer. + sal_Bool ISSET_Referer; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > StatusIndicator; // //::com::sun::star::task::XStatusIndicator - sal_Bool ISSET_StatusIndicator; + sal_Bool ISSET_StatusIndicator; //not documented ... @todo remove? - sal_Bool Silent; //prevents dialogs to query for more information. - sal_Bool ISSET_Silent; - ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. - sal_Bool ISSET_TemplateName; - ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. - sal_Bool ISSET_TemplateRegionName; - sal_Bool Unpacked; - sal_Bool ISSET_Unpacked; + sal_Bool Silent; //prevents dialogs to query for more information. + sal_Bool ISSET_Silent; + ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. + sal_Bool ISSET_TemplateName; + ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. + sal_Bool ISSET_TemplateRegionName; + sal_Bool Unpacked; + sal_Bool ISSET_Unpacked; ::rtl::OUString URL;// FileName, URL of the document. - sal_Bool ISSET_URL; - sal_Int16 Version; //storage version. - sal_Bool ISSET_Version; + sal_Bool ISSET_URL; + sal_Int16 Version; //storage version. + sal_Bool ISSET_Version; ::com::sun::star::uno::Any ViewData;// - sal_Bool ISSET_ViewData; - sal_Int16 ViewId; //id of the initial view. - sal_Bool ISSET_ViewId; + sal_Bool ISSET_ViewData; + sal_Int16 ViewId; //id of the initial view. + sal_Bool ISSET_ViewId; // new framework objects ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index 3833806d185e..1f16b86384b1 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -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 @@ -46,7 +46,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack { public: explicit ModifyListenerCallBack( const Link& rCallBack ); - + virtual ~ModifyListenerCallBack(); void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ); diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 262d2078deea..7e75f280194b 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -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/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx index 026c53634b12..c58854a49a3d 100644 --- a/chart2/source/inc/MutexContainer.hxx +++ b/chart2/source/inc/MutexContainer.hxx @@ -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/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index f44d3cea490a..ad1f46aa0bd9 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -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/chart2/source/inc/NamedFillProperties.hxx b/chart2/source/inc/NamedFillProperties.hxx index 325f8960f7fd..acc1bf02d9fb 100644 --- a/chart2/source/inc/NamedFillProperties.hxx +++ b/chart2/source/inc/NamedFillProperties.hxx @@ -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/chart2/source/inc/NamedLineProperties.hxx b/chart2/source/inc/NamedLineProperties.hxx index 8f16cd970932..f1365ecfaf2f 100644 --- a/chart2/source/inc/NamedLineProperties.hxx +++ b/chart2/source/inc/NamedLineProperties.hxx @@ -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/chart2/source/inc/NamedProperties.hxx b/chart2/source/inc/NamedProperties.hxx index 5f9f5eb94823..3feb521fc5c0 100644 --- a/chart2/source/inc/NamedProperties.hxx +++ b/chart2/source/inc/NamedProperties.hxx @@ -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/chart2/source/inc/NoWarningThisInCTOR.hxx b/chart2/source/inc/NoWarningThisInCTOR.hxx index 00167d07636b..fb8bcad8285b 100644 --- a/chart2/source/inc/NoWarningThisInCTOR.hxx +++ b/chart2/source/inc/NoWarningThisInCTOR.hxx @@ -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/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index fa773a6dab00..1ba9ece0b48b 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -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/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 0765c9acf94a..96bcda55b8ec 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -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 @@ -95,7 +95,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier //where DragParameterString is any string you like to transport information to your special drag service // only semicolon, colon, equal sign and slash are not allowed characters // also the keywors used in the ObjectIdentifiers are not allowed - + //where ObjectID: Parent-Particle:Particle //e.g. Series=2:Point=22 //where Particle: Type=ParticleID //e.g. Point=22 //where Type: getStringForType( ObjectType eType ) or other string @@ -177,7 +177,7 @@ public: , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" , const rtl::OUString& rDragMethodServiceName = rtl::OUString() , const rtl::OUString& rDragParameterString = rtl::OUString() - ); + ); static bool isCID( const rtl::OUString& rName ); static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier ); diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 5548cf81be87..54f8571727e0 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -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/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index eb4fce0360cc..c812d3b74805 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -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/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 48719ec2eeda..3a2a275a1eb1 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -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/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 35819ba111cb..e22ef82003fd 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -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/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 25fda5080409..706e791d4dd0 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -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/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 0a8fd0315bb5..8895d4b9b5c9 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -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 @@ -226,7 +226,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > & xCurve ); - static bool hasEquation( + static bool hasEquation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > & xCurve ); diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 1dd0617236ad..574c36bf0a61 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -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/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index a5585d9901bc..e8978c9a5a70 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -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/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 551f5f0da40d..eecdbd1c3c65 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -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/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx index 9204fa106580..33d3580f1eca 100644 --- a/chart2/source/inc/RessourceManager.hxx +++ b/chart2/source/inc/RessourceManager.hxx @@ -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/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 29fd8e2fb2e0..5bbde9ecfe6b 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -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/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index bceef6712106..4cdab9a3be51 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -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/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 03913fa22842..04f94741ca29 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -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 @@ -43,12 +43,12 @@ static com::sun::star::uno::Sequence< rtl::OUString > namespace apphelper { -#define APPHELPER_XSERVICEINFO_DECL() \ - virtual ::rtl::OUString SAL_CALL \ +#define APPHELPER_XSERVICEINFO_DECL() \ + virtual ::rtl::OUString SAL_CALL \ getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const ::rtl::OUString& ServiceName ) \ + supportsService( const ::rtl::OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ getSupportedServiceNames() \ @@ -64,9 +64,9 @@ namespace apphelper // //========================================================================= -#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ -::rtl::OUString SAL_CALL Class::getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ) \ +#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ +::rtl::OUString SAL_CALL Class::getImplementationName() \ + throw( ::com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ @@ -77,12 +77,12 @@ namespace apphelper } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const ::rtl::OUString& ServiceName ) \ +Class::supportsService( const ::rtl::OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = \ getSupportedServiceNames(); \ - const ::rtl::OUString* pArray = aSNL.getArray(); \ + const ::rtl::OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -108,14 +108,14 @@ Class::getSupportedServiceNames() \ //and implement OWeakObject //========================================================================= -#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ -static ::com::sun::star::uno::Reference< \ - ::com::sun::star::uno::XInterface > SAL_CALL \ - create( ::com::sun::star::uno::Reference< \ +#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ +static ::com::sun::star::uno::Reference< \ + ::com::sun::star::uno::XInterface > SAL_CALL \ + create( ::com::sun::star::uno::Reference< \ ::com::sun::star::uno::XComponentContext > const & xContext) \ - throw(::com::sun::star::uno::Exception) \ -{ \ - return (::cppu::OWeakObject *)new Class( xContext ); \ + throw(::com::sun::star::uno::Exception) \ +{ \ + return (::cppu::OWeakObject *)new Class( xContext ); \ } /** This macro contains the default implementation for getImplementationId(). diff --git a/chart2/source/inc/StackMode.hxx b/chart2/source/inc/StackMode.hxx index e341205522d4..3e550ca1d03f 100644 --- a/chart2/source/inc/StackMode.hxx +++ b/chart2/source/inc/StackMode.hxx @@ -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/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index af05d5f3f0e8..63da21472759 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -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/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 47ed75e80a9a..88c3f403e10a 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.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 @@ -35,18 +35,18 @@ //#define RID_APP_START 30000 ////#define STR_NULL (RID_APP_START + 1) -////#define STR_BASIC_IDE (RID_APP_START + 2) +////#define STR_BASIC_IDE (RID_APP_START + 2) //#define STR_LINES (RID_APP_START + 3) -//#define STR_COLUMNS (RID_APP_START + 4) +//#define STR_COLUMNS (RID_APP_START + 4) //#define STR_BARS (RID_APP_START + 5) //#define STR_AREAS (RID_APP_START + 6) -//#define STR_CIRCLES (RID_APP_START + 7) -//#define STR_DONUT2 (RID_APP_START + 9) +//#define STR_CIRCLES (RID_APP_START + 7) +//#define STR_DONUT2 (RID_APP_START + 9) //#define STR_OFS (RID_APP_START + 14) -//#define STR_XY (RID_APP_START + 16) -//#define STR_XYZ (RID_APP_START + 17) +//#define STR_XY (RID_APP_START + 16) +//#define STR_XYZ (RID_APP_START + 17) //#define STR_ONLY_SYMBOLS (RID_APP_START + 115) -//#define STR_LINESYMB (RID_APP_START + 15) +//#define STR_LINESYMB (RID_APP_START + 15) //#define STR_LINE_SYMBOLS (RID_APP_START + 117) //#define STR_SYMBOL (RID_APP_START + 53) //#define STR_SYMBOL_STACK (RID_APP_START + 54) @@ -55,32 +55,32 @@ //#define STR_SPLINE_CUBIC_SYMBOL (RID_APP_START + 57) //#define STR_SPLINE_B (RID_APP_START + 58) //#define STR_SPLINE_B_SYMBOL (RID_APP_START + 59) -//#define STR_STOCKCHART (RID_APP_START + 142) -//#define STR_SAEULE_3D_1 (RID_APP_START + 149) -//#define STR_SAEULE_3D_2 (RID_APP_START + 150) -//#define STR_SAEULE_3D_3 (RID_APP_START + 151) -//#define STR_SAEULE_3D_4 (RID_APP_START + 152) -//#define STR_ROEHRE_3D_1 (RID_APP_START + 153) -//#define STR_ROEHRE_3D_2 (RID_APP_START + 154) -//#define STR_ROEHRE_3D_3 (RID_APP_START + 155) -//#define STR_ROEHRE_3D_4 (RID_APP_START + 156) -//#define STR_PYRAMID_3D_1 (RID_APP_START + 157) -//#define STR_PYRAMID_3D_2 (RID_APP_START + 158) -//#define STR_PYRAMID_3D_3 (RID_APP_START + 159) -//#define STR_PYRAMID_3D_4 (RID_APP_START + 160) -//#define STR_PYRAMIDQ_3D_1 (RID_APP_START + 161) -//#define STR_PYRAMIDQ_3D_2 (RID_APP_START + 162) -//#define STR_PYRAMIDQ_3D_3 (RID_APP_START + 163) -//#define STR_PYRAMIDQ_3D_4 (RID_APP_START + 164) -//#define STR_KEGEL_3D_1 (RID_APP_START + 165) -//#define STR_KEGEL_3D_2 (RID_APP_START + 166) -//#define STR_KEGEL_3D_3 (RID_APP_START + 167) -//#define STR_KEGEL_3D_4 (RID_APP_START + 168) -//#define STR_KEGELQ_3D_1 (RID_APP_START + 169) -//#define STR_KEGELQ_3D_2 (RID_APP_START + 170) -//#define STR_KEGELQ_3D_3 (RID_APP_START + 171) -//#define STR_KEGELQ_3D_4 (RID_APP_START + 172) -////#define STR_NORMAL_LINES (RID_APP_START + 18) +//#define STR_STOCKCHART (RID_APP_START + 142) +//#define STR_SAEULE_3D_1 (RID_APP_START + 149) +//#define STR_SAEULE_3D_2 (RID_APP_START + 150) +//#define STR_SAEULE_3D_3 (RID_APP_START + 151) +//#define STR_SAEULE_3D_4 (RID_APP_START + 152) +//#define STR_ROEHRE_3D_1 (RID_APP_START + 153) +//#define STR_ROEHRE_3D_2 (RID_APP_START + 154) +//#define STR_ROEHRE_3D_3 (RID_APP_START + 155) +//#define STR_ROEHRE_3D_4 (RID_APP_START + 156) +//#define STR_PYRAMID_3D_1 (RID_APP_START + 157) +//#define STR_PYRAMID_3D_2 (RID_APP_START + 158) +//#define STR_PYRAMID_3D_3 (RID_APP_START + 159) +//#define STR_PYRAMID_3D_4 (RID_APP_START + 160) +//#define STR_PYRAMIDQ_3D_1 (RID_APP_START + 161) +//#define STR_PYRAMIDQ_3D_2 (RID_APP_START + 162) +//#define STR_PYRAMIDQ_3D_3 (RID_APP_START + 163) +//#define STR_PYRAMIDQ_3D_4 (RID_APP_START + 164) +//#define STR_KEGEL_3D_1 (RID_APP_START + 165) +//#define STR_KEGEL_3D_2 (RID_APP_START + 166) +//#define STR_KEGEL_3D_3 (RID_APP_START + 167) +//#define STR_KEGEL_3D_4 (RID_APP_START + 168) +//#define STR_KEGELQ_3D_1 (RID_APP_START + 169) +//#define STR_KEGELQ_3D_2 (RID_APP_START + 170) +//#define STR_KEGELQ_3D_3 (RID_APP_START + 171) +//#define STR_KEGELQ_3D_4 (RID_APP_START + 172) +////#define STR_NORMAL_LINES (RID_APP_START + 18) ////#define STR_SURFACE (RID_APP_START + 19) // #define STR_STEPMAIN_LT_MAXVALUE (RID_APP_START + 103) // #define STR_STEPHELP_LT_STEPMAIN (RID_APP_START + 104) @@ -94,15 +94,15 @@ //see Strings_ChartTypes.src #define STR_NORMAL (RID_APP_START + 10) -#define STR_STACKED (RID_APP_START + 11) -#define STR_PERCENT (RID_APP_START + 12) +#define STR_STACKED (RID_APP_START + 11) +#define STR_PERCENT (RID_APP_START + 12) #define STR_DEEP (RID_APP_START + 13) #define STR_FILLED (RID_APP_START + 285) -#define STR_DONUT (RID_APP_START + 8) +#define STR_DONUT (RID_APP_START + 8) #define STR_TYPE_PIE (RID_APP_START + 187) #define STR_PIE_EXPLODED (RID_APP_START + 188) -#define STR_DONUT_EXPLODED (RID_APP_START + 189) +#define STR_DONUT_EXPLODED (RID_APP_START + 189) #define STR_TYPE_COLUMN (RID_APP_START + 190) #define STR_TYPE_BAR (RID_APP_START + 191) @@ -121,11 +121,11 @@ #define STR_TYPE_NET (RID_APP_START + 52) -#define STR_TYPE_STOCK (RID_APP_START + 126) -#define STR_STOCK_1 (RID_APP_START + 143) -#define STR_STOCK_2 (RID_APP_START + 144) -#define STR_STOCK_3 (RID_APP_START + 145) -#define STR_STOCK_4 (RID_APP_START + 146) +#define STR_TYPE_STOCK (RID_APP_START + 126) +#define STR_STOCK_1 (RID_APP_START + 143) +#define STR_STOCK_2 (RID_APP_START + 144) +#define STR_STOCK_3 (RID_APP_START + 145) +#define STR_STOCK_4 (RID_APP_START + 146) #define STR_TYPE_BUBBLE (RID_APP_START + 282) #define STR_BUBBLE_1 (RID_APP_START + 283) @@ -161,8 +161,8 @@ //for scale tab page //see Strings_Scale.src -#define STR_INVALID_NUMBER (RID_APP_START + 100) -#define STR_STEP_GT_ZERO (RID_APP_START + 102) +#define STR_INVALID_NUMBER (RID_APP_START + 100) +#define STR_STEP_GT_ZERO (RID_APP_START + 102) #define STR_BAD_LOGARITHM (RID_APP_START + 111) #define STR_MIN_GREATER_MAX (RID_APP_START + 101) @@ -202,10 +202,10 @@ #define STR_PAGE_DATA_RANGE (RID_APP_START + 238) #define STR_ACTION_EDIT_CHART_DATA (RID_APP_START + 198) -#define STR_OBJECT_PAGE (RID_APP_START + 30) +#define STR_OBJECT_PAGE (RID_APP_START + 30) #define STR_OBJECT_DIAGRAM (RID_APP_START + 31) -#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) -#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) +#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) +#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) #define STR_OBJECT_LEGEND (RID_APP_START + 48) #define STR_OBJECT_LEGEND_SYMBOL (RID_APP_START + 49) @@ -231,8 +231,8 @@ #define STR_OBJECT_FOR_SERIES (RID_APP_START + 288) #define STR_OBJECT_FOR_ALL_SERIES (RID_APP_START + 289) -#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) -#define STR_OBJECT_ERROR_BARS (RID_APP_START + 175) +#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) +#define STR_OBJECT_ERROR_BARS (RID_APP_START + 175) #define STR_OBJECT_CURVE (RID_APP_START + 176) #define STR_OBJECT_CURVES (RID_APP_START + 130) @@ -241,9 +241,9 @@ #define STR_OBJECT_AXES (RID_APP_START + 209) #define STR_OBJECT_AXIS (RID_APP_START + 210) -#define STR_OBJECT_AXIS_X (RID_APP_START + 211) -#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) -#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) +#define STR_OBJECT_AXIS_X (RID_APP_START + 211) +#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) +#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) #define STR_OBJECT_SECONDARY_X_AXIS (RID_APP_START + 286) #define STR_OBJECT_SECONDARY_Y_AXIS (RID_APP_START + 287) @@ -262,7 +262,7 @@ #define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265) #define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) -#define STR_STATISTICS_IN_LEGEND (RID_APP_START + 180) +#define STR_STATISTICS_IN_LEGEND (RID_APP_START + 180) #define STR_OBJECT_SHAPE (RID_APP_START + 290) @@ -305,7 +305,7 @@ #define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) #define STR_ACTION_EDIT_DATA_RANGES (RID_APP_START + 64) -#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) +#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) #define STR_ACTION_TOGGLE_LEGEND (RID_APP_START + 83) #define STR_ACTION_TOGGLE_GRID_HORZ (RID_APP_START + 86) #define STR_ACTION_SCALE_TEXT (RID_APP_START + 93) @@ -317,14 +317,14 @@ //----------------------------------------------------------------------------- //statusbar strings and balloon help -#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) +#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) #define STR_STATUS_OBJECT_MARKED (RID_APP_START + 51) -#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) -#define STR_TIP_DATASERIES (RID_APP_START + 43) -#define STR_TIP_DATAPOINT (RID_APP_START + 140) -#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) -#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) -#define STR_TIP_CATEGORY_VALUE (RID_APP_START + 139) +#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) +#define STR_TIP_DATASERIES (RID_APP_START + 43) +#define STR_TIP_DATAPOINT (RID_APP_START + 140) +#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) +#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) +#define STR_TIP_CATEGORY_VALUE (RID_APP_START + 139) //----------------------------------------------------------------------------- //warning and info boxes @@ -343,61 +343,61 @@ //----------------------------------------------------------------------------- /* -////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34) -////#define STR_DIAGRAM_Y_AXIS (RID_APP_START + 35) -////#define STR_DIAGRAM_Z_AXIS (RID_APP_START + 36) +////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34) +////#define STR_DIAGRAM_Y_AXIS (RID_APP_START + 35) +////#define STR_DIAGRAM_Z_AXIS (RID_APP_START + 36) ////#define STR_ACTION_DIAGRAM_DATA (RID_APP_START + 63) -////#define STR_UNDO_AUTOFORMAT (RID_APP_START + 79) +////#define STR_UNDO_AUTOFORMAT (RID_APP_START + 79) ////#define STR_DIAGRAM_DESCR_ROW (RID_APP_START + 46) ////#define STR_DIAGRAM_DESCR_COL (RID_APP_START + 47) ////#define STR_LEGEND_SYMBOL_COL (RID_APP_START + 50) ////#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED (RID_APP_START + 110) ////#define STR_QUERY_SORT (RID_APP_START + 113) -////#define STR_CFG_DEFAULT_COLORS (RID_APP_START + 177) -////#define STR_DIAGRAM_DATA_SAFETY_QUERY (RID_APP_START + 181) -////#define STR_UNDO_CUT (RID_APP_START + 60) -////#define STR_UNDO_DELETE (RID_APP_START + 61) -////#define STR_UNDO_DRAGDROP (RID_APP_START + 62) +////#define STR_CFG_DEFAULT_COLORS (RID_APP_START + 177) +////#define STR_DIAGRAM_DATA_SAFETY_QUERY (RID_APP_START + 181) +////#define STR_UNDO_CUT (RID_APP_START + 60) +////#define STR_UNDO_DELETE (RID_APP_START + 61) +////#define STR_UNDO_DRAGDROP (RID_APP_START + 62) ////#define STR_UNDO_INSERT_TITLE (RID_APP_START + 65) ////#define STR_UNDO_INSERT_LEGEND (RID_APP_START + 66) ////#define STR_UNDO_INSERT_DESCR (RID_APP_START + 67) ////#define STR_UNDO_INSERT_AXIS (RID_APP_START + 68) -////#define STR_UNDO_DATA_ROW (RID_APP_START + 69) -////#define STR_UNDO_DATA_POINT (RID_APP_START + 70) -////#define STR_UNDO_TITLE (RID_APP_START + 71) -////#define STR_UNDO_LEGEND (RID_APP_START + 72) +////#define STR_UNDO_DATA_ROW (RID_APP_START + 69) +////#define STR_UNDO_DATA_POINT (RID_APP_START + 70) +////#define STR_UNDO_TITLE (RID_APP_START + 71) +////#define STR_UNDO_LEGEND (RID_APP_START + 72) ////#define STR_UNDO_DIAGRAM_AXIS (RID_APP_START + 73) ////#define STR_UNDO_DIAGRAM_GRID (RID_APP_START + 74) ////#define STR_UNDO_DIAGRAM_WALL (RID_APP_START + 75) ////#define STR_UNDO_DIAGRAM_FLOOR (RID_APP_START + 76) ////#define STR_UNDO_DIAGRAM_AREA (RID_APP_START + 77) -////#define STR_UNDO_LIGHTING (RID_APP_START + 81) +////#define STR_UNDO_LIGHTING (RID_APP_START + 81) ////#define STR_UNDO_TOGGLE_TITLE (RID_APP_START + 82) ////#define STR_UNDO_TOGGLE_AXIS_TITLE (RID_APP_START + 84) ////#define STR_UNDO_TOGGLE_AXIS_DESCR (RID_APP_START + 85) -////#define STR_DEFAULTVIEW (RID_APP_START + 90) +////#define STR_DEFAULTVIEW (RID_APP_START + 90) ////#define STR_UNDO_STATISTICS (RID_APP_START + 91) ////#define STR_UNDO_DIAGRAM_LINE (RID_APP_START + 92) ////#define STR_UNDO_REMOVEPOINTATTRS (RID_APP_START + 94) -////#define STR_UNDO_MOREFRONT (RID_APP_START + 95) -////#define STR_UNDO_MOREBACK (RID_APP_START + 96) -////#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START + 173) -////#define STR_UNDO_INSERT_GRID (RID_APP_START + 178) +////#define STR_UNDO_MOREFRONT (RID_APP_START + 95) +////#define STR_UNDO_MOREBACK (RID_APP_START + 96) +////#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START + 173) +////#define STR_UNDO_INSERT_GRID (RID_APP_START + 178) ////#define STR_UNDO_TRANSFORM (RID_APP_START + 183) ////#define STR_UNDO_MOVE (RID_APP_START + 184) ////#define STR_UNDO_RESIZE (RID_APP_START + 185) ////#define STR_UNDO_ROTATE (RID_APP_START + 186) -////#define STR_UNDO_DIAGRAM_STOCK_LOSS (RID_APP_START + 147) -////#define STR_UNDO_DIAGRAM_STOCK_PLUS (RID_APP_START + 148) -////#define STR_OPEN_DOCUMENT (RID_APP_START + 105) use SID_DOC_LOADING instead -////#define STR_SAVE_DOCUMENT (RID_APP_START + 106) use SID_SAVEDOC instead -////#define STR_GRAPHIC (RID_APP_START + 108) +////#define STR_UNDO_DIAGRAM_STOCK_LOSS (RID_APP_START + 147) +////#define STR_UNDO_DIAGRAM_STOCK_PLUS (RID_APP_START + 148) +////#define STR_OPEN_DOCUMENT (RID_APP_START + 105) use SID_DOC_LOADING instead +////#define STR_SAVE_DOCUMENT (RID_APP_START + 106) use SID_SAVEDOC instead +////#define STR_GRAPHIC (RID_APP_START + 108) ////#define STR_CHART_DOCUMENT (RID_APP_START + 109) ////#define STR_CHART_DOCUMENT_FULLTYPE_40 (RID_APP_START + 114) ////#define STR_CHART_DOCUMENT_FULLTYPE_31 (RID_APP_START + 118) ////#define STR_CHART_DOCUMENT_FULLTYPE_50 (RID_APP_START + 119) -////#define STR_CHART_DOCUMENT_FULLTYPE_60 (RID_APP_START + 182) -////#define STR_INVISIBLE (RID_APP_START + 120) +////#define STR_CHART_DOCUMENT_FULLTYPE_60 (RID_APP_START + 182) +////#define STR_INVISIBLE (RID_APP_START + 120) ////#define STR_SOLID (RID_APP_START + 121) ////#define STR_APPNAME (RID_APP_START + 139) */ diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index d3d31bd38c5d..e334cd8f5b52 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -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 @@ -79,7 +79,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties , double fXAngleRad, double fYAngleRad, double fZAngleRad ); - + static void getRotationFromDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties @@ -105,7 +105,7 @@ public: SAL_DLLPRIVATE static void convertXYZAngleRadToElevationRotationDeg( sal_Int32& rnElevationDeg, sal_Int32& rnRotationDeg , double fXRad, double fYRad, double fZRad ); - + static double getCameraDistance( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties ); @@ -135,7 +135,7 @@ public: ::com::sun::star::beans::XPropertySet >& xSceneProperties ); static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties ); - + static ThreeDLookScheme detectScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); static void setScheme( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 2de0c16266db..d908caf0fb78 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -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/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx index 6a3c639df26e..371456a7fdc2 100644 --- a/chart2/source/inc/TrueGuard.hxx +++ b/chart2/source/inc/TrueGuard.hxx @@ -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 @@ -38,7 +38,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard public: explicit TrueGuard( bool& rbTrueDuringGuardedTime ); virtual ~TrueGuard(); - + private: bool& m_rbTrueDuringGuardedTime; }; diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 0b601b06f721..51b759e29331 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -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/chart2/source/inc/UndoGuard.hxx b/chart2/source/inc/UndoGuard.hxx index 864d5ccff994..6eb7dcae11b6 100644 --- a/chart2/source/inc/UndoGuard.hxx +++ b/chart2/source/inc/UndoGuard.hxx @@ -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/chart2/source/inc/UndoManager.hxx b/chart2/source/inc/UndoManager.hxx index a28a0d78c470..b97817fa51ac 100644 --- a/chart2/source/inc/UndoManager.hxx +++ b/chart2/source/inc/UndoManager.hxx @@ -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/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index af616a6f6c22..e794e92a6fe1 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -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/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 55f283a94600..d44bd559e5fe 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -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/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 78a263c70cdc..cc86ca6e3246 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -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/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 1dd5889f0d55..2d061b7d5061 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -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/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 1e76bf91ea95..9d3ae6769bbf 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -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/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 91a4b40fd2c9..165e88528889 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -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/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 03cfea84f502..a9f10104e69c 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -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 @@ -57,9 +57,9 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : , ::com::sun::star::beans::XMultiPropertySet , ::com::sun::star::beans::XPropertyState , ::com::sun::star::beans::XMultiPropertyStates - // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper - // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper + // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { public: @@ -131,7 +131,7 @@ protected: //member tWrappedPropertyMap* m_pWrappedPropertyMap;//holds all wrapped properties (containing the special mapping from inner to outer properties) //Container for the XProperyChangedListener. The listeners are inserted by handle. - //OMultiTypeInterfaceContainerHelperInt32 m_aBoundListenerContainer; + //OMultiTypeInterfaceContainerHelperInt32 m_aBoundListenerContainer; //Container for the XPropertyVetoableListener. The listeners are inserted by handle. //OMultiTypeInterfaceContainerHelperInt32 m_aVetoableListenerContainer; diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index addc8a351c29..1ff9e59b29b3 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -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/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx index 5534f2ca737c..3a5ef9798868 100644 --- a/chart2/source/inc/charttoolsdllapi.hxx +++ b/chart2/source/inc/charttoolsdllapi.hxx @@ -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/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index fbcce70bd1d6..86871a5f22af 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -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 @@ -38,75 +38,75 @@ // SCHATTR // ============================================================ -#define SCHATTR_START 1 +#define SCHATTR_START 1 -#define SCHATTR_DATADESCR_START SCHATTR_START -#define SCHATTR_DATADESCR_SHOW_NUMBER SCHATTR_DATADESCR_START -#define SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1) -#define SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2) -#define SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3) +#define SCHATTR_DATADESCR_START SCHATTR_START +#define SCHATTR_DATADESCR_SHOW_NUMBER SCHATTR_DATADESCR_START +#define SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1) +#define SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2) +#define SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3) #define SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 4) #define SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 5) #define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 6) #define SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 7) //percentage values should not be offered #define SCHATTR_DATADESCR_END SCHATTR_DATADESCR_NO_PERCENTVALUE -#define SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1) -#define SCHATTR_LEGEND_POS SCHATTR_LEGEND_START -#define SCHATTR_LEGEND_END SCHATTR_LEGEND_POS +#define SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1) +#define SCHATTR_LEGEND_POS SCHATTR_LEGEND_START +#define SCHATTR_LEGEND_END SCHATTR_LEGEND_POS -#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) -// #define SCHATTR_TEXT_ORIENT SCHATTR_TEXT_START +#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) +// #define SCHATTR_TEXT_ORIENT SCHATTR_TEXT_START // name changed: -#define SCHATTR_TEXT_STACKED SCHATTR_TEXT_START -#define SCHATTR_TEXT_ORDER (SCHATTR_TEXT_START + 1) -#define SCHATTR_TEXT_END SCHATTR_TEXT_ORDER - -#define SCHATTR_Y_AXIS_START (SCHATTR_TEXT_END + 1) -#define SCHATTR_Y_AXIS_AUTO_MIN SCHATTR_Y_AXIS_START -#define SCHATTR_Y_AXIS_MIN (SCHATTR_Y_AXIS_START + 1) -#define SCHATTR_Y_AXIS_AUTO_MAX (SCHATTR_Y_AXIS_START + 2) -#define SCHATTR_Y_AXIS_MAX (SCHATTR_Y_AXIS_START + 3) -#define SCHATTR_Y_AXIS_AUTO_STEP_MAIN (SCHATTR_Y_AXIS_START + 4) -#define SCHATTR_Y_AXIS_STEP_MAIN (SCHATTR_Y_AXIS_START + 5) -#define SCHATTR_Y_AXIS_AUTO_STEP_HELP (SCHATTR_Y_AXIS_START + 6) -#define SCHATTR_Y_AXIS_STEP_HELP (SCHATTR_Y_AXIS_START + 7) -#define SCHATTR_Y_AXIS_LOGARITHM (SCHATTR_Y_AXIS_START + 8) -#define SCHATTR_Y_AXIS_AUTO_ORIGIN (SCHATTR_Y_AXIS_START + 9) -#define SCHATTR_Y_AXIS_ORIGIN (SCHATTR_Y_AXIS_START + 10) -#define SCHATTR_Y_AXIS_END SCHATTR_Y_AXIS_ORIGIN - -#define SCHATTR_X_AXIS_START (SCHATTR_Y_AXIS_END + 1) -#define SCHATTR_X_AXIS_AUTO_MIN SCHATTR_X_AXIS_START -#define SCHATTR_X_AXIS_MIN (SCHATTR_X_AXIS_START + 1) -#define SCHATTR_X_AXIS_AUTO_MAX (SCHATTR_X_AXIS_START + 2) -#define SCHATTR_X_AXIS_MAX (SCHATTR_X_AXIS_START + 3) -#define SCHATTR_X_AXIS_AUTO_STEP_MAIN (SCHATTR_X_AXIS_START + 4) -#define SCHATTR_X_AXIS_STEP_MAIN (SCHATTR_X_AXIS_START + 5) -#define SCHATTR_X_AXIS_AUTO_STEP_HELP (SCHATTR_X_AXIS_START + 6) -#define SCHATTR_X_AXIS_STEP_HELP (SCHATTR_X_AXIS_START + 7) -#define SCHATTR_X_AXIS_LOGARITHM (SCHATTR_X_AXIS_START + 8) -#define SCHATTR_X_AXIS_AUTO_ORIGIN (SCHATTR_X_AXIS_START + 9) -#define SCHATTR_X_AXIS_ORIGIN (SCHATTR_X_AXIS_START + 10) -#define SCHATTR_X_AXIS_END SCHATTR_X_AXIS_ORIGIN - -#define SCHATTR_Z_AXIS_START (SCHATTR_X_AXIS_END + 1) -#define SCHATTR_Z_AXIS_AUTO_MIN SCHATTR_Z_AXIS_START -#define SCHATTR_Z_AXIS_MIN (SCHATTR_Z_AXIS_START + 1) -#define SCHATTR_Z_AXIS_AUTO_MAX (SCHATTR_Z_AXIS_START + 2) -#define SCHATTR_Z_AXIS_MAX (SCHATTR_Z_AXIS_START + 3) -#define SCHATTR_Z_AXIS_AUTO_STEP_MAIN (SCHATTR_Z_AXIS_START + 4) -#define SCHATTR_Z_AXIS_STEP_MAIN (SCHATTR_Z_AXIS_START + 5) -#define SCHATTR_Z_AXIS_AUTO_STEP_HELP (SCHATTR_Z_AXIS_START + 6) -#define SCHATTR_Z_AXIS_STEP_HELP (SCHATTR_Z_AXIS_START + 7) -#define SCHATTR_Z_AXIS_LOGARITHM (SCHATTR_Z_AXIS_START + 8) -#define SCHATTR_Z_AXIS_AUTO_ORIGIN (SCHATTR_Z_AXIS_START + 9) -#define SCHATTR_Z_AXIS_ORIGIN (SCHATTR_Z_AXIS_START + 10) -#define SCHATTR_Z_AXIS_END SCHATTR_Z_AXIS_ORIGIN +#define SCHATTR_TEXT_STACKED SCHATTR_TEXT_START +#define SCHATTR_TEXT_ORDER (SCHATTR_TEXT_START + 1) +#define SCHATTR_TEXT_END SCHATTR_TEXT_ORDER + +#define SCHATTR_Y_AXIS_START (SCHATTR_TEXT_END + 1) +#define SCHATTR_Y_AXIS_AUTO_MIN SCHATTR_Y_AXIS_START +#define SCHATTR_Y_AXIS_MIN (SCHATTR_Y_AXIS_START + 1) +#define SCHATTR_Y_AXIS_AUTO_MAX (SCHATTR_Y_AXIS_START + 2) +#define SCHATTR_Y_AXIS_MAX (SCHATTR_Y_AXIS_START + 3) +#define SCHATTR_Y_AXIS_AUTO_STEP_MAIN (SCHATTR_Y_AXIS_START + 4) +#define SCHATTR_Y_AXIS_STEP_MAIN (SCHATTR_Y_AXIS_START + 5) +#define SCHATTR_Y_AXIS_AUTO_STEP_HELP (SCHATTR_Y_AXIS_START + 6) +#define SCHATTR_Y_AXIS_STEP_HELP (SCHATTR_Y_AXIS_START + 7) +#define SCHATTR_Y_AXIS_LOGARITHM (SCHATTR_Y_AXIS_START + 8) +#define SCHATTR_Y_AXIS_AUTO_ORIGIN (SCHATTR_Y_AXIS_START + 9) +#define SCHATTR_Y_AXIS_ORIGIN (SCHATTR_Y_AXIS_START + 10) +#define SCHATTR_Y_AXIS_END SCHATTR_Y_AXIS_ORIGIN + +#define SCHATTR_X_AXIS_START (SCHATTR_Y_AXIS_END + 1) +#define SCHATTR_X_AXIS_AUTO_MIN SCHATTR_X_AXIS_START +#define SCHATTR_X_AXIS_MIN (SCHATTR_X_AXIS_START + 1) +#define SCHATTR_X_AXIS_AUTO_MAX (SCHATTR_X_AXIS_START + 2) +#define SCHATTR_X_AXIS_MAX (SCHATTR_X_AXIS_START + 3) +#define SCHATTR_X_AXIS_AUTO_STEP_MAIN (SCHATTR_X_AXIS_START + 4) +#define SCHATTR_X_AXIS_STEP_MAIN (SCHATTR_X_AXIS_START + 5) +#define SCHATTR_X_AXIS_AUTO_STEP_HELP (SCHATTR_X_AXIS_START + 6) +#define SCHATTR_X_AXIS_STEP_HELP (SCHATTR_X_AXIS_START + 7) +#define SCHATTR_X_AXIS_LOGARITHM (SCHATTR_X_AXIS_START + 8) +#define SCHATTR_X_AXIS_AUTO_ORIGIN (SCHATTR_X_AXIS_START + 9) +#define SCHATTR_X_AXIS_ORIGIN (SCHATTR_X_AXIS_START + 10) +#define SCHATTR_X_AXIS_END SCHATTR_X_AXIS_ORIGIN + +#define SCHATTR_Z_AXIS_START (SCHATTR_X_AXIS_END + 1) +#define SCHATTR_Z_AXIS_AUTO_MIN SCHATTR_Z_AXIS_START +#define SCHATTR_Z_AXIS_MIN (SCHATTR_Z_AXIS_START + 1) +#define SCHATTR_Z_AXIS_AUTO_MAX (SCHATTR_Z_AXIS_START + 2) +#define SCHATTR_Z_AXIS_MAX (SCHATTR_Z_AXIS_START + 3) +#define SCHATTR_Z_AXIS_AUTO_STEP_MAIN (SCHATTR_Z_AXIS_START + 4) +#define SCHATTR_Z_AXIS_STEP_MAIN (SCHATTR_Z_AXIS_START + 5) +#define SCHATTR_Z_AXIS_AUTO_STEP_HELP (SCHATTR_Z_AXIS_START + 6) +#define SCHATTR_Z_AXIS_STEP_HELP (SCHATTR_Z_AXIS_START + 7) +#define SCHATTR_Z_AXIS_LOGARITHM (SCHATTR_Z_AXIS_START + 8) +#define SCHATTR_Z_AXIS_AUTO_ORIGIN (SCHATTR_Z_AXIS_START + 9) +#define SCHATTR_Z_AXIS_ORIGIN (SCHATTR_Z_AXIS_START + 10) +#define SCHATTR_Z_AXIS_END SCHATTR_Z_AXIS_ORIGIN // miscellaneous -#define SCHATTR_AXISTYPE (SCHATTR_Z_AXIS_END + 1) +#define SCHATTR_AXISTYPE (SCHATTR_Z_AXIS_END + 1) #define SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_Z_AXIS_END + 2) #define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_Z_AXIS_END + 3) @@ -147,36 +147,36 @@ // also for data point #define SCHATTR_STYLE_SYMBOL ( SCHATTR_STYLE_START + 8 ) -#define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) +#define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) #define SCHATTR_STYLE_END ( SCHATTR_STYLE_SHAPE ) // -------------------------------------------------------------------------- -#define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. +#define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Ummappen: -#define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) -#define SCHATTR_AXIS_AUTO_MIN SCHATTR_AXIS_START -#define SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 1) -#define SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 2) -#define SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 3) -#define SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 4) -#define SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 5) -#define SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 6) +#define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) +#define SCHATTR_AXIS_AUTO_MIN SCHATTR_AXIS_START +#define SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 1) +#define SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 2) +#define SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 3) +#define SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 4) +#define SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 5) +#define SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 6) // SCHATTR_AXIS_STEP_HELP: type changed from double to sal_Int32 ! -#define SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 7) -#define SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 8) -#define SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 9) -#define SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 10) +#define SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 7) +#define SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 8) +#define SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 9) +#define SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 10) //Neu: -#define SCHATTR_AXIS_TICKS (SCHATTR_AXIS_START + 11) -#define SCHATTR_AXIS_NUMFMT (SCHATTR_AXIS_START + 12) -#define SCHATTR_AXIS_NUMFMTPERCENT (SCHATTR_AXIS_START + 13) -#define SCHATTR_AXIS_SHOWAXIS (SCHATTR_AXIS_START + 14) -#define SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_START + 15) -#define SCHATTR_AXIS_SHOWMAINGRID (SCHATTR_AXIS_START + 16) -#define SCHATTR_AXIS_SHOWHELPGRID (SCHATTR_AXIS_START + 17) -#define SCHATTR_AXIS_TOPDOWN (SCHATTR_AXIS_START + 18) -#define SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_START + 19) +#define SCHATTR_AXIS_TICKS (SCHATTR_AXIS_START + 11) +#define SCHATTR_AXIS_NUMFMT (SCHATTR_AXIS_START + 12) +#define SCHATTR_AXIS_NUMFMTPERCENT (SCHATTR_AXIS_START + 13) +#define SCHATTR_AXIS_SHOWAXIS (SCHATTR_AXIS_START + 14) +#define SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_START + 15) +#define SCHATTR_AXIS_SHOWMAINGRID (SCHATTR_AXIS_START + 16) +#define SCHATTR_AXIS_SHOWHELPGRID (SCHATTR_AXIS_START + 17) +#define SCHATTR_AXIS_TOPDOWN (SCHATTR_AXIS_START + 18) +#define SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_START + 19) #define SCHATTR_AXIS_REVERSE (SCHATTR_AXIS_START + 20) #define SCHATTR_AXIS_POSITION (SCHATTR_AXIS_START + 21) #define SCHATTR_AXIS_POSITION_VALUE (SCHATTR_AXIS_START + 22) @@ -185,18 +185,18 @@ #define SCHATTR_AXIS_MARK_POSITION (SCHATTR_AXIS_START + 25) #define SCHATTR_AXIS_END SCHATTR_AXIS_MARK_POSITION -#define SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1) -#define SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2) -#define SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3) -#define SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4) +#define SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1) +#define SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2) +#define SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3) +#define SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4) // non persistent items (binary format) #define SCHATTR_CHARTTYPE_START (SCHATTR_SYMBOL_SIZE + 1) // new from New Chart -#define SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ) -#define SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1) -#define SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2) +#define SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ) +#define SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1) +#define SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2) #define SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3) #define SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4) #define SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5) @@ -242,19 +242,19 @@ // values for SCHATTR_STYLE_SHAPE items #define CHART_SHAPE3D_IGNORE -2 //intern! (GetChartShapeStyle()!) -#define CHART_SHAPE3D_ANY -1 //undefinierter Typ (GetChartShapeStyle()!) +#define CHART_SHAPE3D_ANY -1 //undefinierter Typ (GetChartShapeStyle()!) #define CHART_SHAPE3D_SQUARE 0 #define CHART_SHAPE3D_CYLINDER 1 #define CHART_SHAPE3D_CONE 2 #define CHART_SHAPE3D_PYRAMID 3 //reserved -#define CHART_SHAPE3D_HANOI 4 +#define CHART_SHAPE3D_HANOI 4 // values for SCHATTR_AXIS items -#define CHART_AXIS_PRIMARY_X 1 -#define CHART_AXIS_PRIMARY_Y 2 -#define CHART_AXIS_PRIMARY_Z 3 -#define CHART_AXIS_SECONDARY_Y 4 -#define CHART_AXIS_SECONDARY_X 5 +#define CHART_AXIS_PRIMARY_X 1 +#define CHART_AXIS_PRIMARY_Y 2 +#define CHART_AXIS_PRIMARY_Z 3 +#define CHART_AXIS_SECONDARY_Y 4 +#define CHART_AXIS_SECONDARY_X 5 // ============================================================ // ============================================================ diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index 4d07791a884f..2d3bd4c3648e 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -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/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 5bcf67a8592b..167a616b19a9 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -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 @@ -75,7 +75,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getChartRootShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>& xPage ); - + SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index d10ee8d415fc..5e22c48329c2 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -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 @@ -107,7 +107,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex /*-1 for whole series*/ , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); - + static sal_Int32 getExplicitPercentageNumberFormatKeyForDataLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 9f5f44107997..f65b1090317a 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -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/chart2/source/inc/chartview/chartviewdllapi.hxx b/chart2/source/inc/chartview/chartviewdllapi.hxx index 39c553a15fe6..ca044c673d41 100644 --- a/chart2/source/inc/chartview/chartviewdllapi.hxx +++ b/chart2/source/inc/chartview/chartviewdllapi.hxx @@ -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/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx index bd52c33f51ec..25ccb77ce656 100644 --- a/chart2/source/inc/chartview/servicenames_charttypes.hxx +++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx @@ -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/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index ac64e879e9ec..668734ef4829 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -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/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index d1af0edb3335..ce2e310b7476 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -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/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 60e39bccf09a..c85904add127 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -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/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx index 002f75c7ece6..f303d0de662b 100644 --- a/chart2/source/inc/servicenames_coosystems.hxx +++ b/chart2/source/inc/servicenames_coosystems.hxx @@ -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/chart2/source/inc/servicenames_dlwrapper.hxx b/chart2/source/inc/servicenames_dlwrapper.hxx index 0b78a8c8227f..41674528ec12 100644 --- a/chart2/source/inc/servicenames_dlwrapper.hxx +++ b/chart2/source/inc/servicenames_dlwrapper.hxx @@ -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/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index b66c4bc46102..3a416b89e3b4 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -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 @@ -393,9 +393,9 @@ sal_Int32 XMLFilter::impl_Import( comphelper::PropertyMapEntry aImportInfoMap[] = { // #80365# necessary properties for XML progress bar at load time - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (Reference *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 22346e917453..bcdbf5bdbc89 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -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/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 7c9fd075d787..eef79cb0c0d3 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -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/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index de721be48142..cd2c25bd7405 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -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/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index e05bac782b86..9c56a74ac4f6 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -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/chart2/source/model/inc/DataSeriesTree.hxx b/chart2/source/model/inc/DataSeriesTree.hxx index 5c6734dde845..1c8b51ce96a4 100644 --- a/chart2/source/model/inc/DataSeriesTree.hxx +++ b/chart2/source/model/inc/DataSeriesTree.hxx @@ -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/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index fc672e29b24c..364f76e36ad9 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -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 @@ -109,12 +109,12 @@ protected: virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XDiagram ____ // virtual ::rtl::OUString SAL_CALL getChartTypeTemplateServiceName() @@ -136,8 +136,8 @@ protected: virtual void SAL_CALL setDefaultColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) throw (::com::sun::star::uno::RuntimeException); - - + + // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< @@ -159,7 +159,7 @@ protected: ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index cf82e1cb0871..f04641036ae0 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -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/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 7fa98b79964b..416629e66bab 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -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/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 69b008bbcb75..668a4ee10262 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -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 @@ -105,8 +105,8 @@ protected: /** fills the oasis flag only when a filtername was set * - * \param _rMediaDescriptor - * \param _rOutOASIS + * \param _rMediaDescriptor + * \param _rOutOASIS */ virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ); @@ -176,18 +176,18 @@ public: :XMLFilter(_xContext) {} /// establish methods for factory instatiation - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) - { - return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) + { + return (::cppu::OWeakObject *)new XMLReportFilterHelper( xContext ); } static ::rtl::OUString getImplementationName_Static() { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.report.XMLFilter" )); } protected: - virtual ::rtl::OUString SAL_CALL - getImplementationName() + virtual ::rtl::OUString SAL_CALL + getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { return getImplementationName_Static(); diff --git a/chart2/source/model/inc/_serviceregistration_charttypes.hxx b/chart2/source/model/inc/_serviceregistration_charttypes.hxx index 481a7064f311..98b52a7761fc 100644 --- a/chart2/source/model/inc/_serviceregistration_charttypes.hxx +++ b/chart2/source/model/inc/_serviceregistration_charttypes.hxx @@ -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/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index fd1d78ebe071..90f0a681a0f0 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -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 @@ -425,7 +425,7 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) m_aScaleData = rScaleData; } AllocateSubGrids(); - + //don't keep the mutex locked while calling out if( xOldCategories.is() && xOldCategories != xNewCategories ) { diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 7f72e08b8b69..5aa03be9b6e3 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -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 @@ -95,12 +95,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XAxis ____ virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 4fa58cff5039..4a0bd372ee59 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -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/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index fdaa333b1cb8..13a51cf6391e 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -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/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 950169395c95..382ccf6347af 100755 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -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 @@ -156,7 +156,7 @@ ChartModel::ChartModel( const ChartModel & rOther ) Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground ); Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager ); Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap ); - + { MutexGuard aGuard( m_aModelMutex ); xListener = this; @@ -166,12 +166,12 @@ ChartModel::ChartModel( const ChartModel & rOther ) m_xChartTypeManager = xChartTypeManager; m_xXMLNamespaceMap = xXMLNamespaceMap; } - + ModifyListenerHelper::addListener( xNewTitle, xListener ); ModifyListenerHelper::addListener( xNewDiagram, xListener ); ModifyListenerHelper::addListener( xNewPageBackground, xListener ); xListener.clear(); - + osl_decrementInterlockedCount(&m_refCount); } @@ -384,11 +384,11 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo //case: current controller is disconnected: if( m_xCurrentController == xController ) m_xCurrentController.clear(); - + DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) { /* suspends some notifications to the controllers which are used for display updates. @@ -576,7 +576,7 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven //----------------------------------------------------------------- // util::XCloseBroadcaster (base of XCloseable) //----------------------------------------------------------------- -void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) +void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) throw(uno::RuntimeException) { m_aLifeTimeManager.g_addCloseListener( xListener ); @@ -1043,6 +1043,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { + ControllerLockGuard aLockGuard( this ); bool bChanged = (m_aVisualAreaSize.Width != aSize.Width || m_aVisualAreaSize.Height != aSize.Height); @@ -1170,7 +1171,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors // aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, // C2U( "GDIMetaFile" ), -// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); +// ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, C2U( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); @@ -1367,7 +1368,7 @@ Reference< chart2::XUndoManager > SAL_CALL ChartModel::getUndoManager() uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() throw (uno::RuntimeException) { - Reference< chart2::data::XDataSource > xSource( + Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); if( xSource.is()) return xSource->getDataSequences(); diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 23da02f3f83a..275c611d957c 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -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 @@ -86,14 +86,14 @@ namespace impl // Note: needed for queryInterface (if it calls the base-class implementation) typedef ::comphelper::WeakImplHelper20< -// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument - ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster - ,::com::sun::star::frame::XStorable2 //(extension of XStorable) -// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2 - ,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface) - // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper +// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument + ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster + ,::com::sun::star::frame::XStorable2 //(extension of XStorable) +// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2 + ,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface) + // ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::lang::XServiceInfo ,::com::sun::star::chart2::XChartDocument // derived from XModel ,::com::sun::star::chart2::data::XDataReceiver // public API @@ -119,23 +119,23 @@ class ChartModel : public impl::ChartModel_Base { private: - mutable ::apphelper::CloseableLifeTimeManager m_aLifeTimeManager; + mutable ::apphelper::CloseableLifeTimeManager m_aLifeTimeManager; - mutable ::osl::Mutex m_aModelMutex; - sal_Bool volatile m_bReadOnly; - sal_Bool volatile m_bModified; + mutable ::osl::Mutex m_aModelMutex; + sal_Bool volatile m_bReadOnly; + sal_Bool volatile m_bModified; sal_Int32 m_nInLoad; - sal_Bool volatile m_bUpdateNotificationsPending; + sal_Bool volatile m_bUpdateNotificationsPending; - ::rtl::OUString m_aResource; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; + ::rtl::OUString m_aResource; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties; ::cppu::OInterfaceContainerHelper m_aControllers; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; - sal_uInt16 m_nControllerLockCount; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; + sal_uInt16 m_nControllerLockCount; -// ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrinterOptions; +// ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrinterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg; @@ -184,7 +184,7 @@ private: ::rtl::OUString impl_g_getLocation(); sal_Bool - impl_isControllerConnected( const com::sun::star::uno::Reference< + impl_isControllerConnected( const com::sun::star::uno::Reference< com::sun::star::frame::XController >& xController ); com::sun::star::uno::Reference< com::sun::star::frame::XController > @@ -256,10 +256,10 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException); + getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getArgs() throw (::com::sun::star::uno::RuntimeException); + getArgs() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< @@ -272,7 +272,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException); + lockControllers() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException); @@ -300,7 +300,7 @@ public: // ::com::sun::star::lang::XComponent (base of XModel) //----------------------------------------------------------------- virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< @@ -346,16 +346,16 @@ public: // ::com::sun::star::frame::XStorable (required interface) //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - hasLocation() throw (::com::sun::star::uno::RuntimeException); + hasLocation() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException); + getLocation() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException); + isReadonly() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - store() throw (::com::sun::star::io::IOException + store() throw (::com::sun::star::io::IOException , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -376,7 +376,7 @@ public: // ::com::sun::star::util::XModifiable (required interface) //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - isModified() throw (::com::sun::star::uno::RuntimeException); + isModified() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setModified( sal_Bool bModified ) diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 1868c38e094f..a2cda82ba514 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -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 @@ -608,16 +608,16 @@ void ChartModel::impl_load( { OSL_ENSURE( false, "loadFromStorage cannot create filter" ); } - + if( xStorage.is() ) impl_loadGraphics( xStorage ); setModified( sal_False ); - + // switchToStorage without notifying listeners (which shouldn't exist at // this time, anyway) m_xStorage = xStorage; - + { MutexGuard aGuard( m_aModelMutex ); m_nInLoad--; @@ -629,35 +629,35 @@ void ChartModel::impl_loadGraphics( { try { - const Reference< embed::XStorage >& xGraphicsStorage( - xStorage->openStorageElement( C2U( "Pictures" ), + const Reference< embed::XStorage >& xGraphicsStorage( + xStorage->openStorageElement( C2U( "Pictures" ), embed::ElementModes::READ ) ); - + if( xGraphicsStorage.is() ) - { + { const uno::Sequence< ::rtl::OUString > aElementNames( xGraphicsStorage->getElementNames() ); - + for( int i = 0; i < aElementNames.getLength(); ++i ) { if( xGraphicsStorage->isStreamElement( aElementNames[ i ] ) ) { - uno::Reference< io::XStream > xElementStream( - xGraphicsStorage->openStreamElement( + uno::Reference< io::XStream > xElementStream( + xGraphicsStorage->openStreamElement( aElementNames[ i ], embed::ElementModes::READ ) ); - + if( xElementStream.is() ) { - std::auto_ptr< SvStream > apIStm( - ::utl::UcbStreamHelper::CreateStream( + std::auto_ptr< SvStream > apIStm( + ::utl::UcbStreamHelper::CreateStream( xElementStream, true ) ); if( apIStm.get() ) { Graphic aGraphic; - - if( !GraphicConverter::Import( + + if( !GraphicConverter::Import( *apIStm.get(), aGraphic ) ) { diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 1f3d92e4d94b..6672d23b7bf4 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -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/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 1498b8345963..0749b90dd994 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -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/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 964f61b128ed..ffc4e626821c 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -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/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 5d4d02af36ef..1ed3deaa841f 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -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/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 89197aa5ba3f..f78d94ab733f 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -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 @@ -266,7 +266,7 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const if( aFound == aStaticDefaults.end()) throw beans::UnknownPropertyException(); - + return (*aFound).second; // \-- } diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 29a41bd38e14..057e6492a447 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -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/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index 6805b80c975b..37730790fe27 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -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/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index ff8a0c4030bc..2bfb2cf7a9ba 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -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/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 9d38fafd3cf7..8a0158f80b24 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -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 @@ -128,7 +128,7 @@ void SAL_CALL FormattedString::setString( const ::rtl::OUString& String ) } //don't keep the mutex locked while calling out fireModifyEvent(); - + } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 9293d73afa5b..c47354c72493 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -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 @@ -93,12 +93,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index a8d5be5d1453..a691d88256c8 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -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/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 1c0ae0ed849a..28b22c1358e5 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -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/chart2/source/model/main/LayoutContainer.cxx b/chart2/source/model/main/LayoutContainer.cxx index d962113f78c7..ce6edef52a1b 100644 --- a/chart2/source/model/main/LayoutContainer.cxx +++ b/chart2/source/model/main/LayoutContainer.cxx @@ -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/chart2/source/model/main/LayoutContainer.hxx b/chart2/source/model/main/LayoutContainer.hxx index ea645dcff536..d5e3fdfdbfad 100644 --- a/chart2/source/model/main/LayoutContainer.hxx +++ b/chart2/source/model/main/LayoutContainer.hxx @@ -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/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index c1143ecdf77a..46ec4fca4e0e 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -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/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 6b645828f4c1..c3a1a74d51cf 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -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 @@ -90,12 +90,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XLegend ____ virtual void SAL_CALL registerEntry( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0dbe1d82fcf3..00b6643b0df6 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -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/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 9875a76eae2b..fc83630c6039 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -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 @@ -83,12 +83,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 9022a5e17901..49ca42048f8a 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -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/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 9a3c7f8ab623..ecba210ae566 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -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/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index d7c5691d160d..8c58abf155ea 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -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/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 5889910018b7..724cfd2e1d88 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -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 @@ -88,12 +88,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 2ad00a4c90ae..8e68dbf70a98 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -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/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 8c796b4da432..5a70fe87d3e2 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -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 @@ -81,12 +81,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index b0a7739008ad..a3f3f19cd4ed 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -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/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 003220c87dfb..475234fd3cc1 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -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/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 9955d5eb537e..546ca1e92a27 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -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/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 5fe21cfb25e0..bcc50306a8d2 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -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 @@ -257,7 +257,7 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index a84a4b645c2a..a9c75328dfe0 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -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/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index e877a34007de..dd1dc25555d7 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -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/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 884a52e3a228..7b508535e2bb 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -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/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 01dc4c253d2b..2235cb54445d 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -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 @@ -217,7 +217,7 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } @@ -320,7 +320,7 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( } } } - + DiagramHelper::setVertical( xDiagram, false ); } diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index fabf7a59826c..4581c5a109b5 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -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/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 9922ed4df5fb..173847850f5a 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -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 @@ -90,7 +90,7 @@ namespace chart { BubbleChartType::BubbleChartType( - const uno::Reference< uno::XComponentContext > & xContext ) + const uno::Reference< uno::XComponentContext > & xContext ) : ChartType( xContext ) { } @@ -137,7 +137,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL aScaleData.AxisType = chart2::AxisType::SERIES; else aScaleData.AxisType = chart2::AxisType::REALNUMBER; - + xAxis->setScaleData( aScaleData ); } diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index eea8a0e7a6ee..4d618648e340 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -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/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 59b552cc8995..1cf108a80b23 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -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/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index 24d35c6acbb7..7413b5def1b3 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -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/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 1f26fff907e4..bc256590fc23 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -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 @@ -77,14 +77,14 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( Reference< data::XLabeledDataSequence > xCategories; bool bHasCategories = HasCategories( aArguments, aData ); - + bool bHasXValues = false; sal_Int32 nDataSeqCount = aData.getLength(); bHasXValues = bHasCategories ? ( (nDataSeqCount-1) > 2 && (nDataSeqCount-1) % 2 != 0 ) :( nDataSeqCount > 2 && nDataSeqCount % 2 != 0 ); - bool bCategoriesUsed = false; + bool bCategoriesUsed = false; bool bNextIsYValues = bHasCategories ? nDataSeqCount>2 : nDataSeqCount>1; for( sal_Int32 nDataIdx = 0; nDataIdx < aData.getLength(); ++nDataIdx ) { diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index 3eb6ebaedbf0..6c3664dbb916 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -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/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 22c8e058ea53..e7a69c8d0b86 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -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/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index d32c4c455d74..ecbceebe69f4 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -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/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 22a744769fc6..48b6a67f3a8b 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -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 @@ -210,7 +210,7 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData for( sal_Int32 nN=0; nN >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) @@ -138,12 +138,12 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL convertFastPropertyValue +// virtual sal_Bool SAL_CALL convertFastPropertyValue // ( ::com::sun::star::uno::Any & rConvertedValue, // ::com::sun::star::uno::Any & rOldValue, // sal_Int32 nHandle, // const ::com::sun::star::uno::Any& rValue ) -// throw (::com::sun::star::lang::IllegalArgumentException); +// throw (::com::sun::star::lang::IllegalArgumentException); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index d34617ffce1f..44757824934e 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -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/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index e3943e9eb45f..c001b03b76a2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -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 @@ -732,7 +732,7 @@ void ChartTypeTemplate::adaptAxes( const Sequence< Reference< XCoordinateSystem > > & rCoordSys ) { //adapt properties of exsisting axes and remove superfluous axes - + if( rCoordSys.getLength() > 0 ) { for( sal_Int32 nCooSysIdx=0; nCooSysIdx < rCoordSys.getLength(); ++nCooSysIdx ) diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 3f43e0ca6038..d50b0bf99334 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -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 @@ -92,7 +92,7 @@ public: APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation -// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) +// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) protected: // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index aa11d77e8995..3c73d4878b88 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -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/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3386b6a1cd40..835c2c7b787e 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -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/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 663cad4c2fe4..4b9d6233dd50 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -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 @@ -428,7 +428,7 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter { //todo... OSL_ENSURE( false, "number of lines may not be valid anymore in the datainterpreter" ); - + } return m_xDataInterpreter; diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index ce86188e2bb6..0937221c8481 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -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/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 18e22f78e86e..0533a7e41528 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -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/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index b9b8a62a4097..44cc8229c583 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -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/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index b619553ee959..8e9d6a83dbb6 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -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/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index a2d6201fc023..70f5fd65daa0 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -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/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index d90dc8b9f7c7..fd6418c70320 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -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/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 14beee021b34..23b0e2103c90 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -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/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index f96d7ed1297d..9da596241b3e 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -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/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 1821333a4cdc..0a6e5b259691 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -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/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 8d582178a128..34f9c09f33e3 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -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/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index faee9715720a..eb243fc61eb6 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -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/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ddf001b2a6e4..4452a7ae93f1 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -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 @@ -97,7 +97,7 @@ Reference< XCoordinateSystem > SAL_CALL aScaleData.AxisType = AxisType::REALNUMBER; xAxis->setScaleData( aScaleData ); } - + return xResult; } diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index ba5dc48b6881..a534194a94ce 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -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/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index b67817e73997..1e21f448887d 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -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 @@ -117,7 +117,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( //filled net chart?: if( m_bHasFilledArea ) return sal_True; - + // check symbol-style // for a template with symbols it is ok, if there is at least one series // with symbols, otherwise an unknown template is too easy to achieve @@ -209,7 +209,7 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index f66355a3576e..9af0667b38da 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -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/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 9c199bb23d70..11011372aaea 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -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/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index fccd4e9ee25c..f87412a513a6 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -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/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index c16682846d53..474f8eaeec75 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -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 @@ -555,7 +555,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( // line style DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); - + // vary colors by point xProp->setPropertyValue( C2U("VaryColorsByPoint"), uno::makeAny( true )); } diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index 1634e643611f..31ea67831f1c 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -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/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 8c4ab0d18415..2577219fd0d4 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -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 @@ -182,7 +182,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL aScaleData.AxisType = chart2::AxisType::SERIES; else aScaleData.AxisType = chart2::AxisType::REALNUMBER; - + xAxis->setScaleData( aScaleData ); } diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index aed0cce2a97f..dcc671d74c87 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -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/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index a83d9a8a4ea3..00a85f2b4c4c 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -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/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 048cca73a92c..0b50f4b0a2a9 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -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/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 00ace6c330ad..4f319607b1e6 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -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 @@ -281,7 +281,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( xProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_SOLID )); } } - + } catch( uno::Exception & ex ) { @@ -373,7 +373,7 @@ void StockChartTypeTemplate::createChartTypes( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW ); aChartTypeVec.push_back( xCT ); - + if( aSeriesSeq.getLength() > nSeriesIndex && aSeriesSeq[nSeriesIndex].getLength() > 0 ) { @@ -395,7 +395,7 @@ void StockChartTypeTemplate::createChartTypes( xCTProp->setPropertyValue( C2U("ShowFirst"), uno::makeAny( bShowFirst )); xCTProp->setPropertyValue( C2U("ShowHighLow"), uno::makeAny( bShowHighLow )); } - + if( aSeriesSeq.getLength() > nSeriesIndex && aSeriesSeq[ nSeriesIndex ].getLength() > 0 ) { diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index c9347ff4e070..f1f0be5c6414 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -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/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 0d134516a1bb..bc5debf0cfe0 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -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/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index bb9edf48c169..dae6cddf3c0b 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -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/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 839c0cbac510..19f24a0cf757 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -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 @@ -77,7 +77,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( Reference< data::XLabeledDataSequence > xCategories; // check for categories. If true, the the categories bet parked in the axis scale, but not used via setting the Axistype to Not CATEGORY bool bHasCategories = HasCategories( aArguments, aData ); - + // parse data bool bCategoriesUsed = false; for( sal_Int32 nDataIdx= 0; nDataIdx < aData.getLength(); ++nDataIdx ) @@ -163,7 +163,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( throw (uno::RuntimeException) { InterpretedData aResult( aInterpretedData ); - + sal_Int32 i=0; Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); const sal_Int32 nCount = aSeries.getLength(); diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index c8ecb4d17778..bd4f0edbda9f 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -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/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx index c0ffb8f4825f..b026b910b2d8 100644 --- a/chart2/source/model/template/_serviceregistration_charttypes.cxx +++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx @@ -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/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 8cdd24e4dc05..551637b570e0 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -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/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx index 0ec7df9b7d71..7a41b84504dc 100644 --- a/chart2/source/tools/BaseGFXHelper.cxx +++ b/chart2/source/tools/BaseGFXHelper.cxx @@ -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 @@ -71,7 +71,7 @@ namespace BaseGFXHelper return aRet; } - + B2IRectangle makeRectangle( const awt::Point& rPos, const awt::Size& rSize ) { return B2IRectangle(rPos.X,rPos.Y,rPos.X+rSize.Width,rPos.Y+rSize.Height); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 678cd8ba8314..3f161d41f3da 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -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/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index cca655780a79..4f5611218851 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -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/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index 9629138cb2be..fbc3231de9e8 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -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 @@ -104,7 +104,7 @@ void lcl_TraceDataSeriesSeq( const Sequence< Reference< XDataSeries > > & aSerie { Reference< beans::XPropertySet > xProp( aSeries[j], uno::UNO_QUERY ); OUString aId; - + OSL_TRACE( "%*cindex %ld", nIndent, lcl_aSpace, j ); StackingDirection aStDir; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index a49b2abeac98..5a3e55fa7bb5 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -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 @@ -251,7 +251,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un { //the property is optional! } - + xDiagramProperties->setPropertyValue( C2U("IncludeHiddenCells"), aNewValue); } } diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index b851a3864b97..96003f22221c 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -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 @@ -306,7 +306,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const xSeriesProp->getPropertyValue( C2U("StackingDirection") ) >>= eStacking; bStacked = (chart2::StackingDirection_Y_STACKING == eStacking); } - + aRet.realloc( bStacked ? 3 : 6 ); sal_Int32* pSeq = aRet.getArray(); if(!bStacked) @@ -319,7 +319,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const else { *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::TOP; - *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; + *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::BOTTOM; } } *pSeq++ = ::com::sun::star::chart::DataLabelPlacement::CENTER; diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index 55fbd368426a..b77a23ace65e 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -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/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index 762cb436a9a7..17e4670f34d1 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -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/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index e9d90248ce84..7281030a6e01 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -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 @@ -129,8 +129,8 @@ drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMat ::basegfx::B3DPoint Position3DToB3DPoint( const drawing::Position3D& rPosition ) { return ::basegfx::B3DPoint( - rPosition.PositionX , - rPosition.PositionY , + rPosition.PositionX , + rPosition.PositionY , rPosition.PositionZ ); } @@ -199,7 +199,7 @@ void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position drawing::Position3D getPointFromPoly( const drawing::PolyPolygonShape3D& rPolygon, sal_Int32 nPointIndex, sal_Int32 nPolyIndex ) { drawing::Position3D aRet(0.0,0.0,0.0); - + if( nPolyIndex>=0 && nPolyIndex DataSourceHelper::pressUsedDataIntoR DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x") ) ); if( xXValues.is() ) aResultVector.push_back( xXValues ); - + //add all other sequences now without x-values for( sal_Int32 nN=0; nN & xDiagram, b eGlobalStackMode = eLocalStackMode; } } - + return eGlobalStackMode; } @@ -445,7 +445,7 @@ StackMode DiagramHelper::getStackModeFromChartType( sal_Int32 nAxisIndex = 0; if( nSeriesCount ) nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(aSeries[0]); - + Reference< chart2::XAxis > xAxis( xCorrespondingCoordinateSystem->getAxisByDimension( 1,nAxisIndex )); if( xAxis.is()) @@ -1031,7 +1031,7 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories( if(xChartModel.is()) { uno::Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) ); - ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, xChartModel ); + ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, xChartModel ); aRet = aExplicitCategoriesProvider.getSimpleCategories(); } return aRet; @@ -1174,7 +1174,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( else nNewSeriesIndex++; - + if( nNewSeriesIndex >= 0 && nNewSeriesIndex < aSeriesList.getLength() ) { //move series in the same charttype @@ -1317,7 +1317,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference< { uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); - + if( xChartType .is() ) { rtl::OUString aChartType = xChartType->getChartType(); @@ -1414,7 +1414,7 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment( nResult = aAvailableMissingValueTreatments[0]; return nResult; } - + return nResult; } @@ -1471,7 +1471,7 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > aNewPos.Anchor = drawing::Alignment_TOP_LEFT; aNewPos.Primary = double(rPosRect.X)/double(aPageSize.Width); aNewPos.Secondary = double(rPosRect.Y)/double(aPageSize.Height); - + chart2::RelativeSize aNewSize; aNewSize.Primary = double(rPosRect.Width)/double(aPageSize.Width); aNewSize.Secondary = double(rPosRect.Height)/double(aPageSize.Height); @@ -1484,7 +1484,7 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > aNewPos.Primary = 1.0 - aNewSize.Primary; if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - + xDiaProps->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aNewPos) ); xDiaProps->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aNewSize) ); @@ -1515,7 +1515,7 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference awt::Size aAbsSize( aRelSize.Primary * aPageSize.Width, aRelSize.Secondary * aPageSize.Height ); - + awt::Point aAbsPos( static_cast< sal_Int32 >( aRelPos.Primary * aPageSize.Width ), static_cast< sal_Int32 >( aRelPos.Secondary * aPageSize.Height )); @@ -1523,7 +1523,7 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference awt::Point aAbsPosLeftTop = RelativePositionHelper::getUpperLeftCornerOfAnchoredObject( aAbsPos, aAbsSize, aRelPos.Anchor ); aRet = awt::Rectangle(aAbsPosLeftTop.X, aAbsPosLeftTop.Y, aAbsSize.Width, aAbsSize.Height ); - + return aRet; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 7468d8bb7896..6d1658fc9347 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -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/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index bd1c1bb79813..7a63ea913f9f 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -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 @@ -70,14 +70,14 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: if( xChartDoc.is() ) { uno::Reference< data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() ); - + if( xDataProvider.is() ) { OUString aCatgoriesRange( DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) ); const bool bFirstCellAsLabel = false; const bool bHasCategories = false; const uno::Sequence< sal_Int32 > aSequenceMapping; - + uno::Reference< data::XDataSource > xColumnCategoriesSource( xDataProvider->createDataSource( DataSourceHelper::createArguments( aCatgoriesRange, aSequenceMapping, true /*bUseColumns*/ , bFirstCellAsLabel, bHasCategories ) ) ); @@ -175,7 +175,7 @@ uno::Sequence< rtl::OUString > lcl_DataToStringSequence( const uno::Reference< d if( !xDataSequence.is() ) return aStrings; - + uno::Reference< data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY ); if( xTextualDataSequence.is() ) { @@ -234,7 +234,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( , const std::vector& rLimitingBorders, bool bCreateSingleCategories ) { std::vector< ComplexCategory > aResult; - + sal_Int32 nMaxCount = rStrings.getLength(); OUString aPrevious; sal_Int32 nCurrentCount=0; @@ -261,7 +261,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( } if( nCurrentCount ) aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); - + return aResult; } @@ -369,7 +369,7 @@ void ExplicitCategoriesProvider::init() { m_aExplicitCategories.realloc(0); m_aComplexCats.clear();//not one per index - + if( m_xOriginalCategories.is() ) { if( !hasComplexCategories() ) diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d7bb86174323..f9ea78812fd1 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -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/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index ee23727c321b..c0fe6ae4d705 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -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/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index c13c87d45931..9a9dae16ab22 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -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 @@ -73,7 +73,7 @@ Sequence< Reference< chart2::XFormattedString > > return Sequence< Reference< XFormattedString > >( & xFormStr, 1 ); } - + //............................................................................. } //namespace chart //............................................................................. diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index faf1defd20ac..23126472f39a 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -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/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 505ab598d7da..c43870f92106 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -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/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 65fc97a04b38..28dbd0c58183 100755 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -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 @@ -109,7 +109,7 @@ void InternalData::createDefaultData() m_aData.resize( nSize ); for( sal_Int32 i=0; i > InternalData::getData() const for( sal_Int32 i=0; i( m_aData[ ::std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] ); - + return aResult; } @@ -180,7 +180,7 @@ void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector< double if( nColumnIndex < 0 ) return; enlargeData( nColumnIndex + 1, rNewData.size() ); - + tDataType aSlice = m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ]; for( vector< double >::size_type i = 0; i < rNewData.size(); ++i ) aSlice[i] = rNewData[i]; @@ -272,7 +272,7 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex ) m_aData[nIndex1] = m_aData[nIndex2]; m_aData[nIndex2] = fTemp; } - + vector< OUString > aTemp( m_aColumnLabels[nColumnIndex] ); m_aColumnLabels[nColumnIndex] = m_aColumnLabels[nColumnIndex + 1]; m_aColumnLabels[nColumnIndex + 1] = aTemp; @@ -389,7 +389,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex ) // labels if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size())) m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< OUString> (1)); - + #if OSL_DEBUG_LEVEL > 2 traceData(); #endif diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 4abc51be31af..1bea5314e4e8 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -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 @@ -571,7 +571,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData //don't add the created sequences to the map as they are used temporarily only ... return new DataSource( ContainerHelper::ContainerToSequence(aComplexCategories) ); } - + OSL_ASSERT( aRangeRepresentation.equals( lcl_aCompleteRange )); ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec; @@ -830,7 +830,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( transform( aComplexCategories.begin(), aComplexCategories.end(), aNewStrings.begin(), aComplexCategories.begin(), lcl_setStringAtLevel(nLevel) ); - + if( m_bDataInColumns ) m_aInternalData.setComplexRowLabels( aComplexCategories ); else diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 21ade3aefadc..55c45147ff5c 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -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/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 4e778db1a68c..2c699badb874 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -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 @@ -73,7 +73,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::X xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); } - + } return xLegend; } diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 444e894a101d..837550f8594a 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -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 @@ -318,7 +318,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) //this method is called, if the try to close was successfull osl::ResettableGuard< osl::Mutex > aGuard( m_aAccessMutex ); - m_bInTryClose = sal_False; + m_bInTryClose = sal_False; m_aEndTryClosingCondition.set(); //Mutex needs to be acquired exactly ones @@ -330,8 +330,8 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) void CloseableLifeTimeManager ::impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ) { - m_bOwnership = bDeliverOwnership && bMyVeto; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = bDeliverOwnership && bMyVeto; + m_bOwnershipIsWellKnown = sal_True; } sal_Bool CloseableLifeTimeManager ::impl_shouldCloseAtNextChance() @@ -406,7 +406,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) } sal_Bool CloseableLifeTimeManager -::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) +::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) throw(uno::RuntimeException) { osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 95cf95e21a86..359b3a167293 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -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 @@ -89,7 +89,7 @@ void LineProperties::AddPropertiesToVector( ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); - + rOutProperties.push_back( Property( C2U( "LineJoint" ), PROP_LINE_JOINT, diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 7a372cff4f51..f6009732af3f 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -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/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index c7c2db60431c..84f293eb4cfe 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -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/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 8277a5830b0a..8efd9dfc81f1 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -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/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 687bc203a84f..de081c8e2ecc 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -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 @@ -35,29 +35,29 @@ namespace apphelper { -const short FLAG_DEPRECATED =1; -const short FLAG_MODEL =2; +const short FLAG_DEPRECATED =1; +const short FLAG_MODEL =2; -#define WRITE_PROPERTY( MediaName, nFlags ) \ -if(rProp.Name.equals(::rtl::OUString::createFromAscii(#MediaName))) \ -{ \ - if( rProp.Value >>= MediaName ) \ - ISSET_##MediaName = sal_True; \ - if(nFlags & FLAG_DEPRECATED) \ - { \ +#define WRITE_PROPERTY( MediaName, nFlags ) \ +if(rProp.Name.equals(::rtl::OUString::createFromAscii(#MediaName))) \ +{ \ + if( rProp.Value >>= MediaName ) \ + ISSET_##MediaName = sal_True; \ + if(nFlags & FLAG_DEPRECATED) \ + { \ m_aDeprecatedProperties[nDeprecatedCount]=rProp;\ - nDeprecatedCount++; \ - } \ - else \ - { \ - m_aRegularProperties[nRegularCount]=rProp; \ - nRegularCount++; \ - if( nFlags & FLAG_MODEL) \ - { \ - m_aModelProperties[nModelCount]=rProp; \ - nModelCount++; \ - } \ - } \ + nDeprecatedCount++; \ + } \ + else \ + { \ + m_aRegularProperties[nRegularCount]=rProp; \ + nRegularCount++; \ + if( nFlags & FLAG_MODEL) \ + { \ + m_aModelProperties[nModelCount]=rProp; \ + nModelCount++; \ + } \ + } \ } MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< @@ -149,11 +149,11 @@ void MediaDescriptorHelper::impl_init() ISSET_CharacterSet = sal_False; ISSET_Comment = sal_False; -// ::com::sun::star::uno::Any ComponentData; +// ::com::sun::star::uno::Any ComponentData; ISSET_ComponentData = sal_False; ISSET_FileName = sal_False; -// ::com::sun::star::uno::Any FilterData; +// ::com::sun::star::uno::Any FilterData; ISSET_FilterData = sal_False; ISSET_FilterName = sal_False; ISSET_FilterFlags = sal_False; @@ -175,10 +175,10 @@ void MediaDescriptorHelper::impl_init() ISSET_Overwrite = sal_False; ISSET_Password = sal_False; -// ::com::sun::star::awt::Rectangle PosSize; +// ::com::sun::star::awt::Rectangle PosSize; ISSET_PosSize = sal_False; -// ::com::sun::star::uno::Sequence< sal_Int8 > PostData; +// ::com::sun::star::uno::Sequence< sal_Int8 > PostData; ISSET_PostData = sal_False; ISSET_PostString = sal_False; Preview = sal_False; @@ -197,7 +197,7 @@ void MediaDescriptorHelper::impl_init() Version = 0; ISSET_Version = sal_False; -// ::com::sun::star::uno::Any ViewData; +// ::com::sun::star::uno::Any ViewData; ISSET_ViewData = sal_False; ViewId = 0; ISSET_ViewId = sal_False; diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index ae13b65c39c2..b220cbbb9718 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -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/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 7ac5a2786cef..9969fcaac272 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -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/chart2/source/tools/MutexContainer.cxx b/chart2/source/tools/MutexContainer.cxx index 4fbb14674cdb..6a859f6941fd 100644 --- a/chart2/source/tools/MutexContainer.cxx +++ b/chart2/source/tools/MutexContainer.cxx @@ -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/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 05169c4608f9..82ca8ef92155 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -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 @@ -81,7 +81,7 @@ OUString SAL_CALL NameContainer::getImplementationName() { return m_aImplementationName; } - + sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) { @@ -94,7 +94,7 @@ sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) } return sal_False; } - + Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) { diff --git a/chart2/source/tools/NamedFillProperties.cxx b/chart2/source/tools/NamedFillProperties.cxx index f904c34c1df1..16df852d2435 100644 --- a/chart2/source/tools/NamedFillProperties.cxx +++ b/chart2/source/tools/NamedFillProperties.cxx @@ -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/chart2/source/tools/NamedLineProperties.cxx b/chart2/source/tools/NamedLineProperties.cxx index 02680abf690e..c7ef7ed79924 100644 --- a/chart2/source/tools/NamedLineProperties.cxx +++ b/chart2/source/tools/NamedLineProperties.cxx @@ -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/chart2/source/tools/NamedProperties.cxx b/chart2/source/tools/NamedProperties.cxx index 4fcb536b3279..44840de1568b 100644 --- a/chart2/source/tools/NamedProperties.cxx +++ b/chart2/source/tools/NamedProperties.cxx @@ -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/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index a1caac803dd7..89dbb4929c9e 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -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/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 0599f9317aed..b7721e14ce1b 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -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 @@ -95,7 +95,7 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType if( aRet.getLength() ) aRet.appendAscii(":"); aRet.append( m_aDragMethodEquals ); - aRet.append( rDragMethodServiceName ); + aRet.append( rDragMethodServiceName ); if( rDragParameterString.getLength() ) { @@ -353,7 +353,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( OUString aDragMethodServiceName; OUString aDragParameterString; - + try { //title @@ -369,7 +369,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( eObjectType, aObjectID, aParentParticle, aDragMethodServiceName, aDragParameterString ); } return aRet; - + } //axis @@ -454,7 +454,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( aRet.appendAscii(":"); } aRet.append(rChildParticle); - + return aRet.makeStringAndClear(); } @@ -474,7 +474,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem( , const Reference< frame::XModel >& xChartModel ) { OUStringBuffer aRet; - + Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( xCooSysContainer.is() ) @@ -503,7 +503,7 @@ OUString ObjectIdentifier::createParticleForAxis( , sal_Int32 nAxisIndex ) { OUStringBuffer aRet(C2U("Axis=")); - + aRet.append( OUString::valueOf( nDimensionIndex ) ); aRet.appendAscii(","); aRet.append( OUString::valueOf( nAxisIndex ) ); @@ -571,7 +571,7 @@ OUString ObjectIdentifier::createParticleForLegend( , const Reference< frame::XModel >& xChartModel ) { OUStringBuffer aRet; - + Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); //todo: if more than one diagram is implemeted, find the correct diagram wich is owner of the given legend @@ -599,7 +599,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent( , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" , const OUString& rDragMethodServiceName , const OUString& rDragParameterString - ) + ) //, bool bIsMultiClickObject ) //e.g. true { //e.g. "MultiClick/Series=2:Point=34" @@ -677,7 +677,7 @@ bool ObjectIdentifier::parsePieSegmentDragParameterString( rMaximumPosition.Y = aValueString.toInt32(); if( nCharacterIndex < 0 ) return false; - + return true; } @@ -1028,7 +1028,7 @@ OUString ObjectIdentifier::createDataCurveCID( { OUString aParticleID( OUString::valueOf( nCurveIndex ) ); ObjectType eType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE; - return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle ); + return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle ); } //static @@ -1044,7 +1044,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID( OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ) { OUStringBuffer aRet(rParticle); - + if( aRet.getLength() && rChildParticle.getLength() ) aRet.appendAscii(":"); if( rChildParticle.getLength() ) @@ -1139,7 +1139,7 @@ OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID ) sal_Int32 nEndPos = rCID.getLength(); aRet = rCID.copy(nStartPos,nEndPos-nStartPos); } - + return aRet; } @@ -1379,7 +1379,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( if( nSeriesIndex >= 0 && nSeriesIndex < aDataSeriesSeq.getLength() ) xSeries.set( aDataSeriesSeq[nSeriesIndex] ); } - + return xSeries; } diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index b1d10424b9a1..48d2de023ba8 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -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/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index dd0a1ad6cf2f..ec13538bf2ef 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -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/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 1565344923b1..bd241430cab8 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -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/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 5a37f4980323..fe59260e081b 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -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 @@ -158,7 +158,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( return; static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - + try { awt::Size aRefSize( getPageSize() ); diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx index df407482b34d..e4690d9372b5 100644 --- a/chart2/source/tools/RegressionCalculationHelper.hxx +++ b/chart2/source/tools/RegressionCalculationHelper.hxx @@ -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/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 68e041e668ca..85e47db4dd26 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -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/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index b553dbc2d217..e14d2236f10a 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -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 @@ -516,7 +516,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN { if( !xRegCnt.is()) return NULL; - + try { uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves( @@ -715,7 +715,7 @@ sal_Int32 RegressionCurveHelper::getRegressionCurveIndex( bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCurve > & xCurve ) { - bool bHasEquation = false; + bool bHasEquation = false; if( xCurve.is()) { uno::Reference< beans::XPropertySet > xEquationProp( xCurve->getEquationProperties()); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index cf5be998308e..5b5c436a7416 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -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/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 82098a76e45a..3aeb735562fc 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -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/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ea16e5b7702a..4ca34a8e3138 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -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/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 35dbd828370d..00e85a9f20e4 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -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/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index 4d566b1f7f48..368c27983639 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -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/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index d3da090ca397..cd10a5b039ef 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -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/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 0d6e35974aaa..fe222c7718ac 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -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/chart2/source/tools/RessourceManager.cxx b/chart2/source/tools/RessourceManager.cxx index a2d43b309019..2836b7bbc600 100644 --- a/chart2/source/tools/RessourceManager.cxx +++ b/chart2/source/tools/RessourceManager.cxx @@ -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/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index e106f1dcc5e2..d1c1d87183ed 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -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/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 21a95d99be7d..261ae63526bc 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -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/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 721451c276da..19747b5304c3 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -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/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 44ed73eade43..ac40ff6fb93c 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -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 @@ -69,7 +69,7 @@ bool lcl_isRightAngledAxesSetAndSupported( const Reference< beans::XPropertySet if(bRightAngledAxes) { uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { return true; @@ -167,7 +167,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro return false; uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY ); - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); sal_Int32 nColor = 0; xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ) ) >>= nColor; @@ -192,7 +192,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro xDiagramProps->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; if(!bRightAngledAxes) { - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { ::basegfx::B3DHomMatrix aRotation( lcl_getCompleteRotationMatrix( xDiagramProps ) ); @@ -277,7 +277,7 @@ bool lcl_isSimpleScheme( drawing::ShadeMode aShadeMode return false; if(nObjectLines==0) { - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); return ChartTypeHelper::noBordersForSimpleScheme( xChartType ); } if(nObjectLines!=1) @@ -302,7 +302,7 @@ void lcl_setSimpleScheme( drawing::ShadeMode& rShadeMode rShadeMode = drawing::ShadeMode_FLAT; rnRoundedEdges = 0; - uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); rnObjectLines = ChartTypeHelper::noBordersForSimpleScheme( xChartType ) ? 0 : 1; } @@ -439,7 +439,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( double E = F_PI*nElevationDeg/180; //elevation in Rad double R = F_PI*nRotationDeg/180; //rotation in Rad - + if( (nRotationDeg == 0 || nRotationDeg == 180 ) && ( nElevationDeg == 90 || nElevationDeg == 270 ) ) { @@ -526,7 +526,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( x = E; y = R; double f23 = cos(R)*sin(E); - if( (f23 * sin(x)) < 0.0 ) + if( (f23 * sin(x)) < 0.0 ) x *= -1.0; //todo ?? } else if (nRotationDeg == 90 || nRotationDeg == 270) @@ -560,7 +560,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad( double cy = cos(R)/cos(z); lcl_ensureIntervalMinus1To1(cy); y = acos(cy); - + //element 12 in 23 double fDenominator = cos(z)*(1.0-pow(sin(y),2)); if(fDenominator==0.0) @@ -618,7 +618,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( double& x = fXRad; double& y = fYRad; double& z = fZRad; - + double f11 = cos(y)*cos(z); if( lcl_isSinZero(y) ) @@ -701,7 +701,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( } else if( lcl_isSinZero(z) ) { - //sinY==0 sinZ==0 sinx!=0 cosx!=0 + //sinY==0 sinZ==0 sinx!=0 cosx!=0 //element 13+11 if( f11 > 0 ) R = 0.0; @@ -801,7 +801,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( //cosY!=0 sinY!=0 sinX=0 sinZ!=0 cosZ!=0 double f13 = cos(x)*cos(z)*sin(y); R = atan( f13/f11 ); - + if( f11<0 ) R+=F_PI; @@ -901,7 +901,7 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg( if(f22<0.0) E+=F_PI; } - + rnElevationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( E ) ); rnRotationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( R ) ); } @@ -1024,7 +1024,7 @@ void ThreeDHelper::setRotationAngleToDiagram( { //remind old rotation for adaption of light directions ::basegfx::B3DHomMatrix aInverseOldRotation( lcl_getInverseRotationMatrix( xSceneProperties ) ); - + ::basegfx::B3DHomMatrix aInverseCameraRotation; { ::basegfx::B3DTuple aR( BaseGFXHelper::GetRotationFromMatrix( @@ -1049,7 +1049,7 @@ void ThreeDHelper::setRotationAngleToDiagram( sal_Bool bRightAngledAxes = sal_False; xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); - if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes( + if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { ::basegfx::B3DHomMatrix aNewRotation; @@ -1414,7 +1414,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( nCurrentRoundedEdges = -1; } } - + if( !bDifferentObjectLines ) { drawing::LineStyle aCurrentLineStyle; diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 828a523245ff..0e57d285408d 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -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 @@ -61,7 +61,7 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram( else nTitleIndex = bIsVertical ? TitleHelper::Y_AXIS_TITLE : TitleHelper::X_AXIS_TITLE; } - + switch( nTitleIndex ) { @@ -172,7 +172,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( xTitled = lcl_getTitleParent( eTitleType, xModel ); } } - + if(xTitled.is()) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); @@ -281,7 +281,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText rtl::OUStringBuffer aSource(rNewText); bool bBreakIgnored = false; - sal_Int32 nLen = rNewText.getLength(); + sal_Int32 nLen = rNewText.getLength(); for( sal_Int32 nPos = 0; nPos < nLen; ++nPos ) { sal_Unicode aChar = aSource.charAt( nPos ); @@ -357,7 +357,7 @@ bool TitleHelper::getTitleType( eTitleType& rType { if( !xTitle.is() || !xModel.is() ) return false; - + Reference< chart2::XTitle > xCurrentTitle; for( sal_Int32 nTitleType = TITLE_BEGIN; nTitleType < NORMAL_TITLE_END; nTitleType++ ) { diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx index 6992552367ed..c5a6287675c8 100644 --- a/chart2/source/tools/TrueGuard.cxx +++ b/chart2/source/tools/TrueGuard.cxx @@ -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/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 52cc6b9c03b6..524f5f33756a 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -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/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 707c48c1a6cc..2d01daecdccf 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -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/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index bbb54e20bdce..8efce36efd0a 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -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/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 03178d204ef7..aff8b52bfe72 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -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/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index 601b6e199d59..60feceda1228 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -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/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index aaa6c545a799..aa1915669f00 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -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/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index b41d8a331f11..3076609d0486 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -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 @@ -110,7 +110,7 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState if( xInnerPropertyState.is() ) { aRet = xInnerPropertyState->getPropertyDefault( this->getInnerName() ); - aRet = this->convertInnerToOuterValue( aRet ); + aRet = this->convertInnerToOuterValue( aRet ); } return aRet; } diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 843aeb261a5f..f66d16d0ce54 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -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 @@ -464,7 +464,7 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() for( std::vector< WrappedProperty* >::const_iterator aIt = aPropList.begin(); aIt!=aPropList.end(); ++aIt ) { - WrappedProperty* pProperty = *aIt; + WrappedProperty* pProperty = *aIt; if(pProperty) { sal_Int32 nHandle = getInfoHelper().getHandleByName( pProperty->getOuterName() ); diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index c5d345db0124..ab01787222f5 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -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/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 387b87dfab5a..f85e0ac2a923 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -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/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index 88f99b493144..2d12e46da6d2 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -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/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 890bf87df96e..54d0eefa0d6d 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -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 @@ -185,7 +185,7 @@ ScaleData ScaleAutomatism::getScale() const { return m_aSourceScale; } - + // private -------------------------------------------------------------------- void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx index 9e2e2707c035..984e5fe12013 100644 --- a/chart2/source/view/axes/TickmarkHelper.cxx +++ b/chart2/source/view/axes/TickmarkHelper.cxx @@ -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 @@ -297,7 +297,7 @@ bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex ) if( nTickIndex < m_nCurrentPos ) if( !gotoFirst() ) return false; - + while( nTickIndex > m_nCurrentPos ) if( !gotoNext() ) return false; @@ -551,7 +551,7 @@ double* TickmarkHelper::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth double fDistance = (fAdaptedNextParent - fAdaptedStartParent)/m_rIncrement.SubIncrements[nDepth-1].IntervalCount; m_pfCurrentValues[nDepth] = fAdaptedStartParent + nTick*fDistance; - + //return always the value after scaling if(!bPostEquidistant && m_xInverseScaling.is() ) m_pfCurrentValues[nDepth] = m_rScale.Scaling->doScaling( m_pfCurrentValues[nDepth] ); diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx index 78fc2fe1c502..6cb1c587d0bc 100644 --- a/chart2/source/view/axes/TickmarkHelper.hxx +++ b/chart2/source/view/axes/TickmarkHelper.hxx @@ -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 @@ -254,7 +254,7 @@ private: //member //labels might be posioned high or low on the border of the diagram far away from the axis //add this vector to go from the axis line to the label line (border of the diagram) ::basegfx::B2DVector m_aAxisLineToLabelLineShift; - + double m_fStrech_LogicToScreen; double m_fOffset_LogicToScreen; }; diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx index 09c0179d3698..99eb87065176 100644 --- a/chart2/source/view/axes/TickmarkProperties.hxx +++ b/chart2/source/view/axes/TickmarkProperties.hxx @@ -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/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 0159fb20cad6..759b5a74e21f 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -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 @@ -177,7 +177,7 @@ bool VAxisBase::prepareShapeCreation() //----------------------------------------- //create all scaled tickmark values removeTextShapesFromTicks(); - + createAllTickInfos(m_aAllTickInfos); m_bReCreateAllTickInfos = false; } diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index ba7e94b2070c..6d37493f7eb9 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -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 @@ -70,7 +70,7 @@ public: virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); void setExrtaLinePositionAtOtherAxis( const double& fCrossingAt ); - + //------------------------------------------------------------------------- //------------------------------------------------------------------------- protected: //methods diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index f2e2e90c1045..753df8d78089 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -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/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 35b32b2b1c03..5a1af2df16e7 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -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/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 1e3e62894741..98b3e7a079fb 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -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 @@ -149,7 +149,7 @@ TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const { sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/; - + TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) ); aTickmarkProperties.RelativePos = static_cast(lcl_getTickOffset(aTickmarkProperties.Length+nTickStartDistanceToAxis,nTickmarkStyle)); @@ -324,7 +324,7 @@ void AxisProperties::init( bool bCartesian ) m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1; else m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1; - + if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos ) m_fLabelDirectionSign = m_fInnerDirectionSign; else if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos ) @@ -333,7 +333,7 @@ void AxisProperties::init( bool bCartesian ) m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1; else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos ) m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1; - + if( m_nDimensionIndex==2 ) m_aLabelAlignment = lcl_getLabelAlignmentForZAxis(*this); else @@ -358,13 +358,13 @@ void AxisProperties::init( bool bCartesian ) //init LineProperties m_aLineProperties.initFromPropertySet( xProp ); - //init display labels + //init display labels xProp->getPropertyValue( C2U( "DisplayLabels" ) ) >>= m_bDisplayLabels; //init categories ScaleData aScaleData = m_xAxisModel->getScaleData(); m_nAxisType = aScaleData.AxisType; - + //init TickmarkProperties xProp->getPropertyValue( C2U( "MajorTickmarks" ) ) >>= m_nMajorTickmarks; xProp->getPropertyValue( C2U( "MinorTickmarks" ) ) >>= m_nMinorTickmarks; diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 5b6bfe98f777..1c5714bb663b 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -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/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 8ec895fbd452..f23d73a9f6f1 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -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 @@ -96,7 +96,7 @@ Reference< drawing::XShape > createSingleLabel( , const tNameSequence& rPropNames , const tAnySequence& rPropValues ) -{ +{ if(!rLabel.getLength()) return 0; @@ -104,7 +104,7 @@ Reference< drawing::XShape > createSingleLabel( const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi ); rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); - + Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory) .createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation ); @@ -375,7 +375,7 @@ TickInfo* MaxLabelEquidistantTickIter::nextInfo() gotoIndex( nMaxIndex-1 ); } } - + return EquidistantTickIter::nextInfo(); } @@ -584,7 +584,7 @@ bool VCartesianAxis::createTextShapes( nLimitedSpaceForText = nScreenDistanceBetweenTicks; if( bIsStaggered ) nLimitedSpaceForText *= 2; - + if( nLimitedSpaceForText > 0 ) { //reduce space for a small amount to have a visible distance between the labels: sal_Int32 nReduce = (nLimitedSpaceForText*5)/100; @@ -602,7 +602,7 @@ bool VCartesianAxis::createTextShapes( TickInfo* pPreviousVisibleTickInfo = NULL; TickInfo* pPREPreviousVisibleTickInfo = NULL; TickInfo* pLastVisibleNeighbourTickInfo = NULL; - + //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence aPropNames; @@ -952,12 +952,12 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub double fDeltaX = rEnd.getX() - rStart.getX(); double fDeltaY = rEnd.getY() - rStart.getY(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fMinX, fYOnYPlane, fZOther ) ); aPosList.push_back( getScreenPosAndLogicPos( fMinX, fYOther, fZOnZPlane ) ); - + if( fabs(fDeltaY) > fabs(fDeltaX) ) { m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT; @@ -1006,12 +1006,12 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub double fDeltaX = rEnd.getX() - rStart.getX(); double fDeltaY = rEnd.getY() - rStart.getY(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fXOnXPlane, fMinY, fZOther ) ); aPosList.push_back( getScreenPosAndLogicPos( fXOther, fMinY, fZOnZPlane ) ); - + if( fabs(fDeltaY) > fabs(fDeltaX) ) { m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT; @@ -1085,7 +1085,7 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub rEnd = getScreenPosition( fXEnd, fYEnd, fZEnd ); double fDeltaX = rEnd.getX() - rStart.getX(); - + //only those points are candidates which are lying on exactly one wall as these are outer edges tScreenPosAndLogicPosList aPosList; aPosList.push_back( getScreenPosAndLogicPos( fXOther, fYOnYPlane, fMinZ ) ); @@ -1140,13 +1140,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; if( ( fDeltaY<0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaY>0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; } @@ -1158,13 +1158,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; if( ( fDeltaY<0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaY>0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT; } @@ -1176,13 +1176,13 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub m_aAxisProperties.m_fInnerDirectionSign *= -1.0; } - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ? LABEL_ALIGN_TOP : LABEL_ALIGN_BOTTOM; if( ( fDeltaX>0 && m_aScale.Orientation == AxisOrientation_REVERSE ) || ( fDeltaX<0 && m_aScale.Orientation == AxisOrientation_MATHEMATICAL ) ) - m_aAxisProperties.m_aLabelAlignment = + m_aAxisProperties.m_aLabelAlignment = ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_TOP ) ? LABEL_ALIGN_BOTTOM : LABEL_ALIGN_TOP; } @@ -1201,7 +1201,7 @@ TickmarkHelper_2D* VCartesianAxis::createTickmarkHelper2D() B2DVector aLabelLineStart, aLabelLineEnd; this->get2DAxisMainLine( aLabelLineStart, aLabelLineEnd, this->getLogicValueWhereLabelLineCrossesOtherAxis() ); - + return new TickmarkHelper_2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart ); } @@ -1326,7 +1326,7 @@ void SAL_CALL VCartesianAxis::createLabels() //----------------------------------------- //'hide' tickmarks with identical screen values in aAllTickInfos hideIdenticalScreenValues( m_aAllTickInfos ); - + removeTextShapesFromTicks(); //create tick mark text shapes @@ -1363,7 +1363,7 @@ void SAL_CALL VCartesianAxis::createMaximumLabels() if( !prepareShapeCreation() ) return; - + //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) @@ -1455,7 +1455,7 @@ void SAL_CALL VCartesianAxis::updatePositions() //correctPositionForRotation LabelPositionHelper::correctPositionForRotation( xShape2DText , m_aAxisProperties.m_aLabelAlignment, m_aAxisLabelProperties.fRotationAngleDegree, false ); - } + } } } @@ -1498,7 +1498,7 @@ void SAL_CALL VCartesianAxis::createShapes() { if( !prepareShapeCreation() ) return; - + std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() ); TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get(); if( !pTickmarkHelper2D ) @@ -1559,7 +1559,7 @@ void SAL_CALL VCartesianAxis::createShapes() const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); if(aDepthIter == aDepthEnd)//no tickmarks at all return; - + sal_Int32 nTickmarkPropertiesCount = m_aAxisProperties.m_aTickmarkPropertiesList.size(); for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; aDepthIter++, nDepth++ ) createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickmarkHelper2D, false /*bOnlyAtLabels*/ ); diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 4fbcd2409196..db4e422815c4 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -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 @@ -80,7 +80,7 @@ public: //------------------------------------------------------------------------- virtual TickmarkHelper* createTickmarkHelper(); - + //------------------------------------------------------------------------- double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index a196397e0e9f..ead4efffad53 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -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 @@ -130,7 +130,7 @@ void VCartesianCoordinateSystem::createVAxisList( return; sal_Int32 nDimensionIndex = 0; - + for( nDimensionIndex = 0; nDimensionIndex < nDimensionCount; nDimensionIndex++ ) { sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex); @@ -157,7 +157,7 @@ void VCartesianCoordinateSystem::createVAxisList( || ( aAxisProperties.m_pExplicitCategoriesProvider && aAxisProperties.m_pExplicitCategoriesProvider->hasComplexCategories() ); } } - + if( nDimensionIndex == 2 ) { aAxisProperties.m_xAxisTextProvider = new TextualDataProvider( m_aSeriesNamesForZAxis ); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index b28400c6f906..6613d20e9d99 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -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 @@ -51,7 +51,7 @@ public: virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); - + virtual void createGridShapes(); private: diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 7fe6b9937ca6..d167caba2581 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -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 @@ -135,7 +135,7 @@ GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_In { if( !bSwapXY ) P0=P1; - else + else P2=P1; } } @@ -221,7 +221,7 @@ void SAL_CALL VCartesianGrid::createShapes() //create named group shape Reference< drawing::XShapes > xGroupShape_Shapes( this->createGroupShape( m_xLogicTarget, m_aCID ) ); - + if(!xGroupShape_Shapes.is()) return; //----------------------------------------- @@ -247,7 +247,7 @@ void SAL_CALL VCartesianGrid::createShapes() if(aDepthIter == aDepthEnd)//no tickmarks at all return; - + sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 274b543900e3..cb130c0adcd0 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -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/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index bc908acdf85a..74763b273b0b 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -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 @@ -179,7 +179,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( for( nN = 0 ;nN VCoordinateSystem::getCoordinateSystemResolution( nXResolution = 10; if( nYResolution < 10 ) nYResolution = 10; - + if( this->getPropertySwapXAndYAxis() ) std::swap(nXResolution,nYResolution); - + //2D if( 2 == aResolution.getLength() ) { @@ -215,7 +215,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( for( nN = 0 ;nN VCoordinateSystem::getExplicitScales( sal_Int32 nD impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex ); - + return aRet; } @@ -296,7 +296,7 @@ ExplicitScaleData VCoordinateSystem::getExplicitScale( sal_Int32 nDimensionIndex ExplicitScaleData aRet; impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); - + if( nAxisIndex == 0) { aRet = m_aExplicitScales[nDimensionIndex]; @@ -431,7 +431,7 @@ VAxisBase* VCoordinateSystem::getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAx tVAxisMap::const_iterator aIt = m_aAxisMap.find( aFullAxisIndex ); if( aIt != m_aAxisMap.end() ) pRet = aIt->second.get(); - + return pRet; } @@ -538,7 +538,7 @@ void VCoordinateSystem::createAxesShapes() m_aExplicitScales[0].Origin ); } } - + pVAxis->createShapes(); } } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 865a7848aa9a..d38a4bfc0348 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -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 @@ -82,7 +82,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames, aPropValues, false ); LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps , rAxisLabelProperties.m_aFontReferenceSize ); - + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) @@ -94,7 +94,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( //TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; - + for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo ; pTickInfo = rTickIter.nextInfo(), nTick++ ) @@ -131,7 +131,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor); double fLogicAngle = pTickInfo->fUnscaledTickValue; - + LabelAlignment eLabelAlignment(LABEL_ALIGN_CENTER); PolarLabelPositionHelper aPolarLabelPositionHelper(m_pPosHelper,nDimensionCount,xTarget,&aShapeFactory); sal_Int32 nScreenValueOffsetInRadiusDirection = m_aAxisLabelProperties.m_aMaximumSpaceForLabels.Height/15; @@ -141,7 +141,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( // #i78696# use mathematically correct rotation now const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); - + uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi ); rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); @@ -211,7 +211,7 @@ void SAL_CALL VPolarAngleAxis::createShapes() { if( !prepareShapeCreation() ) return; - + double fLogicRadius = m_pPosHelper->getOuterLogicRadius(); double fLogicZ = -0.5;//as defined diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index c03cf533e22c..5f84521e3550 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -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/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index 23908585ec3a..8730a3abf8d2 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -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/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index 8d4c14188258..9bc1b0d3c0d7 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -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/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 76e057a2b32d..cde46609a5fc 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -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 @@ -69,7 +69,7 @@ uno::Sequence< sal_Int32 > VPolarCoordinateSystem::getCoordinateSystemResolution aResolution[1]/=2;//radius } } - + return aResolution; } @@ -88,7 +88,7 @@ void VPolarCoordinateSystem::createVAxisList( // bool bSwapXAndY = this->getPropertySwapXAndYAxis(); sal_Int32 nDimensionIndex = 0; - + //create angle axis (dimension index 0) for( nDimensionIndex = 0; nDimensionIndex < nDimensionCount; nDimensionIndex++ ) { @@ -146,7 +146,7 @@ void VPolarCoordinateSystem::initVAxisInList() pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(2==nDimensionCount) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } @@ -174,7 +174,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes() pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(2==nDimensionCount) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index f1ba84c5469e..d047bf6541d3 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -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/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 0bd98b642acb..1c29c299cdbe 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -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 @@ -71,7 +71,7 @@ void VPolarGrid::setIncrements( const uno::Sequence< ExplicitIncrementData >& rI void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const { - TickmarkHelper aTickmarkHelper( + TickmarkHelper aTickmarkHelper( m_pPosHelper->getScales()[nDimensionIndex], m_aIncrements[nDimensionIndex] ); aTickmarkHelper.getAllTicks( rAllTickInfos ); } @@ -166,7 +166,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT aPoints[0][1].Y = static_cast(aScenePositionEnd.PositionY); appendPointSequence( aAllPoints, aPoints ); } - + Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xMainTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking @@ -230,14 +230,14 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic if(aPoints[0].getLength()) appendPointSequence( aAllPoints, aPoints ); } - + Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); } } - + void SAL_CALL VPolarGrid::createShapes() { DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized"); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 3289d6c88be8..c24e0727ac26 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -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/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 2206d4d8f559..3bad7a8c5235 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -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 @@ -140,7 +140,7 @@ void SAL_CALL VPolarRadiusAxis::createShapes() { if( !prepareShapeCreation() ) return; - + const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0]; @@ -153,7 +153,7 @@ void SAL_CALL VPolarRadiusAxis::createShapes() xInverseScaling = rAngleScale.Scaling->getInverseScaling(); AxisProperties aAxisProperties(m_aAxisProperties); - + sal_Int32 nTick = 0; EquidistantTickIter aIter( aAngleTickInfos, rAngleIncrement, 0, 0 ); for( TickInfo* pTickInfo = aIter.firstInfo() diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index b5c5191e4c98..6c1ec85cc24b 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -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 @@ -57,7 +57,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const rtl::OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index fd1aaa81c3a0..8313188b693b 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -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 @@ -263,7 +263,7 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting drawing::DoubleSequence* pOuterSourceX = &rPolyPoly.SequenceX.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterSourceY = &rPolyPoly.SequenceY.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterSourceZ = &rPolyPoly.SequenceZ.getArray()[nPolygonIndex]; - + drawing::DoubleSequence* pOuterTargetX = &aTmp.SequenceX.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterTargetY = &aTmp.SequenceY.getArray()[nPolygonIndex]; drawing::DoubleSequence* pOuterTargetZ = &aTmp.SequenceZ.getArray()[nPolygonIndex]; @@ -279,11 +279,11 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting double* pSourceX = pOuterSourceX->getArray(); double* pSourceY = pOuterSourceY->getArray(); double* pSourceZ = pOuterSourceZ->getArray(); - + double* pTargetX = pOuterTargetX->getArray(); double* pTargetY = pOuterTargetY->getArray(); double* pTargetZ = pOuterTargetZ->getArray(); - + //copy first point *pTargetX=*pSourceX++; *pTargetY=*pSourceY++; @@ -303,7 +303,7 @@ void lcl_removeDuplicatePoints( drawing::PolyPolygonShape3D& rPolyPoly, Plotting } pSourceX++; pSourceY++; pSourceZ++; } - + //free unused space if( nTargetPointCount 4) drawing::Position3D aScenePosition( pPosHelper->transformLogicToScene( fLogicX,fLogicY,fLogicZ, false ) ); - //better performance for big data + //better performance for big data FormerPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); if( !pSeries->isAttributedDataPoint(nIndex) @@ -914,7 +914,7 @@ void AreaChart::createShapes() , aScenePosition.PositionZ+this->getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 6924509a62a1..5f5b282cbdc5 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -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 @@ -104,13 +104,13 @@ private: //methods private: //member PlottingPositionHelper* m_pMainPosHelper; - bool m_bArea;//false -> line or symbol only - bool m_bLine; - bool m_bSymbol; + bool m_bArea;//false -> line or symbol only + bool m_bLine; + bool m_bSymbol; bool m_bIsPolarCooSys;//used e.g. for net chart (the data labels need to be placed different) - bool m_bConnectLastToFirstPoint;//used e.g. for net chart + bool m_bConnectLastToFirstPoint;//used e.g. for net chart bool m_bExpandIfValuesCloseToBorder; // e.g. false for net charts - + sal_Int32 m_nKeepAspectRatio; //0->no 1->yes other value->automatic ::com::sun::star::drawing::Direction3D m_aGivenAspectRatio; //only used if nKeepAspectRatio==1 diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 0d7ef403f87d..3130609fc6d1 100755 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -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 @@ -117,7 +117,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const double fXSlotCount = 1.0; if(!m_aZSlots.empty()) fXSlotCount = m_aZSlots.begin()->size(); - + aRet.DirectionZ = aScale.DirectionZ/(aScale.DirectionX + aScale.DirectionX*(fXSlotCount-1.0)*pPosHelper->getSlotWidth()); } else @@ -207,7 +207,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( bool bReverse = !pPosHelper->isMathematicalOrientationY(); bool bNormalOutside = (!bReverse == !!(fBaseValue < fScaledUpperYValue)); double fDepth = fScaledUpperBarDepth; - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: @@ -319,7 +319,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( break; default: DBG_ERROR("this label alignment is not implemented yet"); - + break; } if(3==m_nDimension) @@ -506,7 +506,7 @@ void BarChart::createShapes() bool bOnlyConnectionLinesForThisPoint = false; adaptOverlapAndGapwidthForGroupBarsPerAxis(); - + //better performance for big data std::map< VDataSeries*, FormerBarPoint > aSeriesFormerPointMap; m_bPointsWereSkipped = false; @@ -530,7 +530,7 @@ void BarChart::createShapes() { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); - + for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++ ) { sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries(); @@ -691,9 +691,9 @@ void BarChart::createShapes() //@todo ... start an iteration over the different breaks of the axis //each subsystem may add an additional shape to form the whole point //create a group shape for this point and add to the series shape: - // uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes) ); - // uno::Reference xPointGroupShape_Shape = - // uno::Reference( xPointGroupShape_Shapes, uno::UNO_QUERY ); + // uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes) ); + // uno::Reference xPointGroupShape_Shape = + // uno::Reference( xPointGroupShape_Shapes, uno::UNO_QUERY ); //as long as we do not iterate we do not need to create an additional group for each point uno::Reference< drawing::XShapes > xPointGroupShape_Shapes = xSeriesGroupShape_Shapes; uno::Reference< beans::XPropertySet > xDataPointProperties( (*aSeriesIter)->getPropertiesOfPoint( nCatIndex ) ); @@ -759,7 +759,7 @@ void BarChart::createShapes() fLogicBarDepth*=-1.0; } } - + //better performance for big data FormerBarPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); @@ -860,7 +860,7 @@ void BarChart::createShapes() // if( !aLineProperties.isLineVisible() ) // { // //todo - // //aLineProperties.Color = + // //aLineProperties.Color = // } // xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes @@ -897,7 +897,7 @@ void BarChart::createShapes() LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nCatIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + double fLowerBarDepth = fLogicBarDepth; double fUpperBarDepth = fLogicBarDepth; { diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 403628f7fc43..68c3cf0db250 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -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/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index b1735e99de5d..f8526f58a294 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -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/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 32899de62aef..9b940f5464b5 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -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/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index c5454edcc6fd..1adb7f87aaf3 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -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 @@ -248,7 +248,7 @@ void BubbleChart::createShapes() { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - + aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) { @@ -288,7 +288,7 @@ void BubbleChart::createShapes() if( !m_bShowNegativeValues && fBubbleSize<0.0 ) continue; - + if( ::rtl::math::approxEqual( fBubbleSize, 0.0 ) || ::rtl::math::isNan(fBubbleSize) ) continue; @@ -305,7 +305,7 @@ void BubbleChart::createShapes() //transformation 3) -> 4) drawing::Position3D aScenePosition( pPosHelper->transformLogicToScene( fLogicX,fLogicY,fLogicZ, false ) ); - //better performance for big data + //better performance for big data FormerPoint aFormerPoint( aSeriesFormerPointMap[pSeries] ); pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution ); if( !pSeries->isAttributedDataPoint(nIndex) @@ -348,7 +348,7 @@ void BubbleChart::createShapes() m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); } - + //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) { @@ -358,7 +358,7 @@ void BubbleChart::createShapes() , aScenePosition.PositionZ+this->getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() ); - + switch(nLabelPlacement) { case ::com::sun::star::chart::DataLabelPlacement::TOP: diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 9c04ce8d3719..0e68841d5e91 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -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 @@ -81,7 +81,7 @@ private: //methods private: //member - bool m_bShowNegativeValues;//input parameter + bool m_bShowNegativeValues;//input parameter bool m_bBubbleSizeAsArea;//input parameter double m_fBubbleSizeScaling;//input parameter diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index ddfe50deed2f..777384aa2ce6 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -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 @@ -269,7 +269,7 @@ void CandleStickChart::createShapes() drawing::Position3D aPosMiddleLast( pPosHelper->transformLogicToScene( fLogicX, fY_Last ,0 ,true ) ); drawing::Position3D aPosMiddleMinimum( pPosHelper->transformLogicToScene( fLogicX, fY_Min ,0 ,true ) ); drawing::Position3D aPosMiddleMaximum( pPosHelper->transformLogicToScene( fLogicX, fY_Max ,0 ,true ) ); - + uno::Reference< drawing::XShapes > xLossGainTarget( xGainTarget ); if(bBlack) xLossGainTarget = xLossTarget; @@ -327,7 +327,7 @@ void CandleStickChart::createShapes() else { drawing::PolyPolygonShape3D aPoly; - + sal_Int32 nLineIndex = 0; if( bShowFirst && pPosHelper->isLogicVisible( fLogicX, fY_First ,0 ) && isValidPosition(aPosLeftFirst) && isValidPosition(aPosMiddleFirst) ) @@ -335,7 +335,7 @@ void CandleStickChart::createShapes() AddPointToPoly( aPoly, aPosLeftFirst, nLineIndex ); AddPointToPoly( aPoly, aPosMiddleFirst, nLineIndex++ ); } - if( pPosHelper->isLogicVisible( fLogicX, fY_Last ,0 ) + if( pPosHelper->isLogicVisible( fLogicX, fY_Last ,0 ) && isValidPosition(aPosMiddleLast) && isValidPosition(aPosRightLast) ) { AddPointToPoly( aPoly, aPosMiddleLast, nLineIndex ); @@ -355,7 +355,7 @@ void CandleStickChart::createShapes() } } } - + //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) { diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 60018dbe8621..ff9487c525f1 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -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/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index d43fd0856e02..f32b123f375c 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -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/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index 08cb1978faa1..7a420b58cc8a 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -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/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index eee13848b11b..f4c76806cfe9 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -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 @@ -383,7 +383,7 @@ void PieChart::createShapes() continue; m_pPosHelper->m_fAngleDegreeOffset = pSeries->getStartingAngle(); - + double fLogicYSum = 0.0; //iterate through all points to get the sum sal_Int32 nPointIndex=0; @@ -484,7 +484,7 @@ void PieChart::createShapes() bool bMovementAllowed = ( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP ); if( bMovementAllowed ) nLabelPlacement = ::com::sun::star::chart::DataLabelPlacement::OUTSIDE; - + LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ; if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) @@ -510,7 +510,7 @@ void PieChart::createShapes() aScreenPosition2D.X += aDirection.getX(); aScreenPosition2D.Y += aDirection.getY(); } - + aPieLabelInfo.xTextShape = this->createDataLabel( xTextTarget, *pSeries, nPointIndex , fLogicYValue, fLogicYSum, aScreenPosition2D, eAlignment ); @@ -537,7 +537,7 @@ void PieChart::createShapes() double fMaxDeltaRadius = fUnitCircleOuterRadius-fUnitCircleInnerRadius; drawing::Position3D aOrigin = m_pPosHelper->transformUnitCircleToScene( fAngle, fUnitCircleOuterRadius, fLogicZ ); drawing::Position3D aNewOrigin = m_pPosHelper->transformUnitCircleToScene( fAngle, fUnitCircleOuterRadius + fMaxDeltaRadius, fLogicZ ); - + sal_Int32 nOffsetPercent( static_cast(fExplodePercentage * 100.0) ); awt::Point aMinimumPosition( PlottingPositionHelper::transformSceneToScreenPosition( @@ -638,12 +638,12 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c nShift*=-1; awt::Point aOldPos( this->xLabelGroupShape->getPosition() ); basegfx::B2IVector aNewPos = basegfx::B2IVector( aOldPos.X, aOldPos.Y ) + nShift*aTangentialDirection; - + //check whether the new position is ok awt::Point aNewAWTPos( aNewPos.getX(), aNewPos.getY() ); if( !lcl_isInsidePage( aNewAWTPos, this->xLabelGroupShape->getSize(), rPageSize ) ) return false; - + this->xLabelGroupShape->setPosition( aNewAWTPos ); this->bMoved = true; } @@ -661,7 +661,7 @@ void PieChart::resetLabelPositionsToPreviousState() bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) { //returns true when there might be more to do - + //find borders of a group of overlapping labels bool bOverlapFound = false; PieLabelInfo* pStart = &(*(m_aLabelInfoList.rbegin())); @@ -674,7 +674,7 @@ bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) ::basegfx::B2IRectangle aNextOverlap( aPreviousOverlap ); aPreviousOverlap.intersect( lcl_getRect( pCurrent->pPrevious->xLabelGroupShape ) ); aNextOverlap.intersect( lcl_getRect( pCurrent->pNext->xLabelGroupShape ) ); - + bool bPreviousOverlap = !aPreviousOverlap.isEmpty(); bool bNextOverlap = !aNextOverlap.isEmpty(); if( bPreviousOverlap || bNextOverlap ) diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index e6fedb05d52e..958037e062df 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -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 @@ -55,7 +55,7 @@ public: virtual void SAL_CALL createShapes(); virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ); - + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 67ecac93b64c..b178c8e913f2 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -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 @@ -457,7 +457,7 @@ void SplineCalculater::CalculateBSplines( rResult.SequenceX.realloc(0); rResult.SequenceY.realloc(0); rResult.SequenceZ.realloc(0); - + sal_Int32 nOuterCount = rInput.SequenceX.getLength(); if( !nOuterCount ) return; // no input @@ -470,22 +470,22 @@ void SplineCalculater::CalculateBSplines( { if( rInput.SequenceX[nOuter].getLength() <= 1 ) continue; // need at least 2 control points - + sal_Int32 n = rInput.SequenceX[nOuter].getLength()-1; // maximum index of control points - + double fCurveparam =0.0; // parameter for the curve // 0<= fCurveparam < fMaxCurveparam double fMaxCurveparam = 2.0+ n - k; if (fMaxCurveparam <= 0.0) return; // not enough control points for desired spline order - + if (nGranularity < 1) return; //need at least 1 line for each part beween the control points const double* pOldX = rInput.SequenceX[nOuter].getConstArray(); const double* pOldY = rInput.SequenceY[nOuter].getConstArray(); const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray(); - + // keep this amount of steps to go well with old version sal_Int32 nNewSectorCount = nGranularity * n; double fCurveStep = fMaxCurveparam/static_cast< double >(nNewSectorCount); @@ -500,7 +500,7 @@ void SplineCalculater::CalculateBSplines( double* pNewX = rResult.SequenceX[nOuter].getArray(); double* pNewY = rResult.SequenceY[nOuter].getArray(); double* pNewZ = rResult.SequenceZ[nOuter].getArray(); - + // variables needed inside loop, when calculating one point of output sal_Int32 nPointIndex =0; //index of given contol points double fX=0.0; @@ -509,10 +509,10 @@ void SplineCalculater::CalculateBSplines( for(sal_Int32 nNewSector=0; nNewSector::iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - + //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ ) { @@ -546,7 +546,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re xProp->setPropertyValue( C2U( "Transformation" ), ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } - + if( xSymbol.is() ) { const awt::Point aOldTextPos( xTextShape->getPosition() ); @@ -554,7 +554,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re awt::Size aSymbolSize( xSymbol->getSize() ); awt::Size aTextSize( xTextShape->getSize() ); - + if( !bMultiLineLabel || nLineCountForSymbolsize <= 0 ) nLineCountForSymbolsize = 1; sal_Int32 nYDiff = aTextSize.Height/nLineCountForSymbolsize; @@ -582,7 +582,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re || LABEL_ALIGN_RIGHT_TOP==eAlignment || LABEL_ALIGN_RIGHT_BOTTOM==eAlignment ) { - aNewTextPos.X += nXDiff; + aNewTextPos.X += nXDiff; } else if(LABEL_ALIGN_TOP==eAlignment || LABEL_ALIGN_BOTTOM==eAlignment @@ -591,10 +591,10 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re aSymbolPosition.X -= nXDiff/2; aNewTextPos.X += nXDiff/2; } - + xSymbol->setSize( aSymbolSize ); xSymbol->setPosition( aSymbolPosition ); - + //set position xTextShape->setPosition( aNewTextPos ); } @@ -795,7 +795,7 @@ void VSeriesPlotter::createErrorBar( drawing::Position3D aUnscaledLogicPosition(rUnscaledLogicPosition); if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION) aUnscaledLogicPosition.PositionY = rVDataSeries.getYMeanValue(); - + bool bCreateNegativeBorder = false;//make a vertical line at the negative end of the error bar bool bCreatePositiveBorder = false;//make a vertical line at the positive end of the error bar drawing::Position3D aMiddle(aUnscaledLogicPosition); @@ -1135,7 +1135,7 @@ double VSeriesPlotter::getMinimumX() if( m_bCategoryXAxis ) { double fRet = 1.0;//first category (index 0) matches with real number 1.0 - if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) + if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) fRet -= 0.5; return fRet; } @@ -1150,7 +1150,7 @@ double VSeriesPlotter::getMaximumX() { //return category count double fRet = getPointCount();//first category (index 0) matches with real number 1.0 - if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) + if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) fRet += 0.5; return fRet; } @@ -1805,12 +1805,12 @@ Sequence< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntries( //todo: respect direction of axis in future } - + if(bReverse) aResult.insert( aResult.begin(), aSeriesEntries.begin(), aSeriesEntries.end() ); else aResult.insert( aResult.end(), aSeriesEntries.begin(), aSeriesEntries.end() ); - } + } } } @@ -1828,7 +1828,7 @@ Sequence< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntries( LegendSymbolStyle VSeriesPlotter::getLegendSymbolStyle() { - return chart2::LegendSymbolStyle_BOX; + return chart2::LegendSymbolStyle_BOX; } @@ -1872,7 +1872,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries( Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( const VDataSeries& rSeries - , sal_Int32 nPointIndex + , sal_Int32 nPointIndex , const Reference< drawing::XShapes >& xTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory ) { @@ -1905,7 +1905,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( if( rSeries.isAttributedDataPoint( nPointIndex ) ) xPointSet.set( rSeries.getPropertiesOfPoint( nPointIndex )); - // if a data point has no own color use a color fom the diagram's color scheme + // if a data point has no own color use a color fom the diagram's color scheme if( ! rSeries.hasPointOwnColor( nPointIndex )) { Reference< util::XCloneable > xCloneable( xPointSet,uno::UNO_QUERY ); @@ -1937,7 +1937,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe ) { std::vector< ViewLegendEntry > aResult; - + if( ! ( xShapeFactory.is() && xTarget.is() && xContext.is() ) ) return aResult; @@ -1965,7 +1965,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe if( xShape.is() ) { aEntry.aSymbol = uno::Reference< drawing::XShape >( xSymbolGroup, uno::UNO_QUERY ); - + OUString aChildParticle( ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_DATA_POINT, nIdx ) ); aChildParticle = ObjectIdentifier::addChildParticle( aChildParticle, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_LEGEND_ENTRY, 0 ) ); OUString aCID = ObjectIdentifier::createClassifiedIdentifierForParticles( rSeries.getSeriesParticle(), aChildParticle ); @@ -2028,7 +2028,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe // symbol uno::Reference< drawing::XShapes > xSymbolGroup( ShapeFactory(xShapeFactory).createGroup2D( xTarget )); - + // create the symbol Reference< drawing::XShape > xShape( VLegendSymbolFactory::createSymbol( xSymbolGroup, chart2::LegendSymbolStyle_DIAGONAL_LINE, xShapeFactory, @@ -2039,7 +2039,7 @@ std::vector< ViewLegendEntry > SAL_CALL VSeriesPlotter::createLegendEntriesForSe if( xShape.is()) { aEntry.aSymbol = uno::Reference< drawing::XShape >( xSymbolGroup, uno::UNO_QUERY ); - + bool bAverageLine = false;//@todo find out wether this is an average line or a regression curve ObjectType eObjectType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE; OUString aChildParticle( ObjectIdentifier::createChildParticleWithIndex( eObjectType, i ) ); diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 4174226b6f62..7382be6aa4af 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -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 @@ -88,7 +88,7 @@ VDiagram::VDiagram( { uno::Reference< beans::XPropertySet > xSourceProp( m_xDiagram, uno::UNO_QUERY ); ThreeDHelper::getRotationAngleFromDiagram( xSourceProp, m_fXAnglePi, m_fYAnglePi, m_fZAnglePi ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( m_xDiagram, 0 ) ) ) { if(xSourceProp.is()) @@ -159,7 +159,7 @@ void VDiagram::createShapes( const awt::Point& rPos, const awt::Size& rSize ) //center diagram position m_aCurrentPosWithoutAxes = awt::Point( ShapeFactory::calculateTopLeftPositionToCenterObject( rPos, rAvailableSize, m_aCurrentSizeWithoutAxes ) ); - + } if( m_xWall2D.is() ) @@ -359,7 +359,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) double sy = fabs(sin(m_fYAnglePi)); double cz = fabs(cos(m_fZAnglePi)); double sz = fabs(sin(m_fZAnglePi)); - + if(m_bRightAngledAxes) { //base equations: @@ -523,7 +523,7 @@ void VDiagram::createShapes_3d() "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); ShapeFactory::setShapeName( m_xOuterGroupShape, C2U("PlotAreaExcludingAxes") ); m_xLogicTarget->add(m_xOuterGroupShape); - + uno::Reference< drawing::XShapes > xOuterGroup_Shapes = uno::Reference( m_xOuterGroupShape, uno::UNO_QUERY ); @@ -602,7 +602,7 @@ void VDiagram::createShapes_3d() aStripe.InvertNormal(true); uno::Reference< drawing::XShape > xShape = - m_pShapeFactory->createStripe(xWallGroup_Shapes, aStripe + m_pShapeFactory->createStripe(xWallGroup_Shapes, aStripe , xWallProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, nRotatedTexture, bFlatNormals ); if( !bAddFloorAndWall ) { @@ -676,9 +676,9 @@ void VDiagram::createShapes_3d() aStripe.InvertNormal(true); uno::Reference< drawing::XShape > xShape = - m_pShapeFactory->createStripe(xOuterGroup_Shapes, aStripe + m_pShapeFactory->createStripe(xOuterGroup_Shapes, aStripe , xFloorProp, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), bDoubleSided, 0, bFlatNormals ); - + CuboidPlanePosition eBottomPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBottom( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) ); if( !bAddFloorAndWall || (CuboidPlanePosition_Bottom!=eBottomPos) ) { @@ -763,13 +763,13 @@ void VDiagram::reduceToMimimumSize() ::basegfx::B2IRectangle rAvailableOuterRect( BaseGFXHelper::makeRectangle(m_aAvailablePosIncludingAxes,m_aAvailableSizeIncludingAxes) ); - + sal_Int32 nDeltaWidth = static_cast(rAvailableOuterRect.getWidth() - rConsumedOuterRect.getWidth()); sal_Int32 nDeltaHeight = static_cast(rAvailableOuterRect.getHeight() - rConsumedOuterRect.getHeight()); if( (aNewSize.Width + nDeltaWidth) < rAvailableOuterRect.getWidth()/3 ) nDeltaWidth = static_cast(rAvailableOuterRect.getWidth()/3 - aNewSize.Width); aNewSize.Width += nDeltaWidth; - + if( (aNewSize.Height + nDeltaHeight) < rAvailableOuterRect.getHeight()/3 ) nDeltaHeight = static_cast(rAvailableOuterRect.getHeight()/3 - aNewSize.Height); aNewSize.Height += nDeltaHeight; diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index d04a576737bf..29e224a555c5 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -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 @@ -49,12 +49,12 @@ class Clipping */ public: - /** @descr The intersection between an open polygon and a rectangle is + /** @descr The intersection between an open polygon and a rectangle is calculated and the resulting lines are placed into the poly-polygon aResult. - @param rPolygon The polygon is required to be open, ie. it's start and end point + @param rPolygon The polygon is required to be open, ie. it's start and end point have different coordinates and that it is continuous, ie. has no holes. - @param rRectangle The clipping area. - @param aResult The resulting lines that are the parts of the given polygon lying inside + @param rRectangle The clipping area. + @param aResult The resulting lines that are the parts of the given polygon lying inside the clipping area are stored into aResult whose prior content is deleted first. */ static void clipPolygonAtRectangle( diff --git a/chart2/source/view/inc/LabelAlignment.hxx b/chart2/source/view/inc/LabelAlignment.hxx index 26ec703db302..392a5afc8160 100644 --- a/chart2/source/view/inc/LabelAlignment.hxx +++ b/chart2/source/view/inc/LabelAlignment.hxx @@ -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/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index a240736018bc..85e74e92875f 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -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/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 14b6cda47870..b0559b3f6088 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -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/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 71a728d2dc73..852fb2968a84 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -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/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 1e53d5c144c5..772eca027d11 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -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/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 63e276b19e44..db1ba090b38d 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -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 @@ -72,7 +72,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const rtl::OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setScales( @@ -110,9 +110,9 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; - //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; rtl::OUString m_aCID; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index a1f16883b779..d067533498d7 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -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 @@ -60,7 +60,7 @@ public: PlottingPositionHelper(); PlottingPositionHelper( const PlottingPositionHelper& rSource ); virtual ~PlottingPositionHelper(); - + virtual PlottingPositionHelper* clone() const; virtual PlottingPositionHelper* createSecondaryPosHelper( const ::com::sun::star::chart2::ExplicitScaleData& rSecondaryScale ); @@ -84,7 +84,7 @@ public: inline bool clipYRange( double& rMin, double& rMax ) const; inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip=false ) const; - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationScaledLogicToScene() const; @@ -125,8 +125,8 @@ public: protected: //member ::com::sun::star::uno::Sequence< - ::com::sun::star::chart2::ExplicitScaleData > m_aScales; - ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; + ::com::sun::star::chart2::ExplicitScaleData > m_aScales; + ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene mutable ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index b4fd1fdc8483..7fbd1d4b2cc2 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -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/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index c0871b94f835..1140ad4e72f4 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -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/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 4440ad26ac5a..95ed67928e42 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -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 @@ -81,7 +81,7 @@ public: ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const; ::com::sun::star::chart2::ScaleData getScale() const; - + private: /** Fills the passed scale data and increment data for category scaling. */ void calculateExplicitIncrementAndScaleForCategory( @@ -103,7 +103,7 @@ private: private: ::com::sun::star::chart2::ScaleData m_aSourceScale; - + double m_fValueMinimum; /// Minimum of all source values. double m_fValueMaximum; /// Maximum of all source values. sal_Int32 m_nMaximumAutoMainIncrementCount; /// Maximum number of automatic main increments. diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index ef75f3a323af..867336346c2e 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -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/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index ca1aaf155d1e..1fc053893575 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -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/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index e884af865d6e..c38010c09c8e 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -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 @@ -75,7 +75,7 @@ public: throw (::com::sun::star::uno::RuntimeException); void setParticle( const rtl::OUString& rCooSysParticle ); - + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen(); @@ -93,13 +93,13 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; // returns a coplete increment set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - + void addMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); void clearMinimumAndMaximumSupplierList(); - + void prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex ); - + void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex , const ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale , const ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ); @@ -124,7 +124,7 @@ public: virtual void createAxesShapes(); virtual void createGridShapes(); - + virtual bool getPropertySwapXAndYAxis() const; sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; @@ -168,7 +168,7 @@ protected: //member rtl::OUString m_aCooSysParticle; typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis - + // ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xLogicTargetForGrids; @@ -177,7 +177,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::drawing::HomogenMatrix m_aMatrixSceneToScreen; CuboidPlanePosition m_eLeftWallPos; @@ -186,7 +186,7 @@ protected: //member // MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose - + ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis; typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap; diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 93aba58dbec4..7d2c0b134d68 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -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 @@ -142,7 +142,7 @@ public: sal_Int32 getStartingAngle() const; void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ); - + //this is only temporarily here for area chart: ::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; sal_Int32 m_nPolygonIndex; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 5df198c2f539..194a7e41a978 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -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 @@ -99,7 +99,7 @@ private: //members ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFinalTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; // this is the surrounding shape which contains floor, wall and coordinate diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index a568a9ef4a85..c090eb788b7b 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -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/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index f6ec92d38cf8..fc747b447583 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -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/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index f3da18ac92b6..c0f968361a3a 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -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/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6b6b06437542..3101ee77d002 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -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 @@ -163,7 +163,7 @@ public: */ virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - + /** this enables you to handle series on the same x axis with different y axis the property AttachedAxisIndex at a dataseries indicates which value scale is to use (0==AttachedAxisIndex or a not set AttachedAxisIndex property indicates that this series should be scaled at the main y-axis; @@ -173,11 +173,11 @@ public: nAxisIndex must be greater than 0. nAxisIndex==1 referres to the first secondary axis. ) */ - - virtual void SAL_CALL addSecondaryValueScale( const + + virtual void SAL_CALL addSecondaryValueScale( const ::com::sun::star::chart2::ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); - + //------------------------------------------------------------------------- // MinimumAndMaximumSupplier //------------------------------------------------------------------------- @@ -230,7 +230,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLegendSymbolForPoint( const VDataSeries& rSeries - , sal_Int32 nPointIndex + , sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); @@ -277,15 +277,15 @@ public: ::com::sun::star::chart2::XColorScheme >& xColorScheme ); void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider ); - + //get series names for the z axis labels ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const; void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); - bool PointsWereSkipped() const; - + bool PointsWereSkipped() const; + //return the depth for a logic 1 double getTransformedDepth() const; @@ -424,7 +424,7 @@ protected: //member ::std::vector< ::std::vector< VDataSeriesGroup > > m_aZSlots; - bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values) + bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values) ::std::auto_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper; AxesNumberFormats m_aAxesNumberFormats;//direct numberformats on axes, if empty ask the data series instead diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index 623e46e64fb7..2ee57b3d3dad 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -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/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index d8f997d36da9..face4248f39c 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -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 @@ -71,43 +71,43 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_TEXT_STACKED - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,FALSE); ppPoolDefaults[SCHATTR_TEXT_ORDER - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_TEXT_ORDER); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_Y_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_Y_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_Y_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_Y_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_Y_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_Y_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_X_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_X_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_X_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_X_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_X_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_X_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_X_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_Z_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_Z_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_Z_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP); - ppPoolDefaults[SCHATTR_Z_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP); - ppPoolDefaults[SCHATTR_Z_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_AXISTYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_Y_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_Y_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_Y_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_Y_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_Y_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_Y_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_X_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_X_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_X_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_X_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_X_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_X_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_X_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_Z_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_Z_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_Z_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP); + ppPoolDefaults[SCHATTR_Z_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_Z_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_AXISTYPE - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); @@ -121,8 +121,8 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String()); ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String()); - ppPoolDefaults[SCHATTR_TEXT_DEGREES - SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0); - ppPoolDefaults[SCHATTR_TEXT_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_OVERLAP,FALSE); + ppPoolDefaults[SCHATTR_TEXT_DEGREES - SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0); + ppPoolDefaults[SCHATTR_TEXT_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_OVERLAP,FALSE); ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0); ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 0); @@ -135,48 +135,48 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STYLE_SYMBOL - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SYMBOL, 0); ppPoolDefaults[SCHATTR_STYLE_SHAPE - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SHAPE, 0); - ppPoolDefaults[SCHATTR_AXIS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!! + ppPoolDefaults[SCHATTR_AXIS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!! - ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN); - ppPoolDefaults[SCHATTR_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN); - ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX); - ppPoolDefaults[SCHATTR_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MAX); - ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN); - ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN); - ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP); -// ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_HELP); + ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN); + ppPoolDefaults[SCHATTR_AXIS_MIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN); + ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX); + ppPoolDefaults[SCHATTR_AXIS_MAX - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MAX); + ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_MAIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN); + ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN); + ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP); +// ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_HELP); // type changed from double to sal_Int32 - ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0); - ppPoolDefaults[SCHATTR_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LOGARITHM); - ppPoolDefaults[SCHATTR_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN); - ppPoolDefaults[SCHATTR_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_ORIGIN); - - ppPoolDefaults[SCHATTR_AXIS_TICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TICKS,CHAXIS_MARK_OUTER); - ppPoolDefaults[SCHATTR_AXIS_NUMFMT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMT,0); - ppPoolDefaults[SCHATTR_AXIS_NUMFMTPERCENT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMTPERCENT,11); - ppPoolDefaults[SCHATTR_AXIS_SHOWAXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWAXIS,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWMAINGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWMAINGRID,0); - ppPoolDefaults[SCHATTR_AXIS_SHOWHELPGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWHELPGRID,0); - ppPoolDefaults[SCHATTR_AXIS_TOPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_TOPDOWN,0); - ppPoolDefaults[SCHATTR_AXIS_HELPTICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELPTICKS,0); - ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0); + ppPoolDefaults[SCHATTR_AXIS_STEP_HELP - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0); + ppPoolDefaults[SCHATTR_AXIS_LOGARITHM - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LOGARITHM); + ppPoolDefaults[SCHATTR_AXIS_AUTO_ORIGIN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN); + ppPoolDefaults[SCHATTR_AXIS_ORIGIN - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_ORIGIN); + + ppPoolDefaults[SCHATTR_AXIS_TICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TICKS,CHAXIS_MARK_OUTER); + ppPoolDefaults[SCHATTR_AXIS_NUMFMT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMT,0); + ppPoolDefaults[SCHATTR_AXIS_NUMFMTPERCENT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMTPERCENT,11); + ppPoolDefaults[SCHATTR_AXIS_SHOWAXIS - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWAXIS,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWMAINGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWMAINGRID,0); + ppPoolDefaults[SCHATTR_AXIS_SHOWHELPGRID - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWHELPGRID,0); + ppPoolDefaults[SCHATTR_AXIS_TOPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_TOPDOWN,0); + ppPoolDefaults[SCHATTR_AXIS_HELPTICKS - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELPTICKS,0); + ppPoolDefaults[SCHATTR_AXIS_REVERSE - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0); ppPoolDefaults[SCHATTR_AXIS_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_POSITION,0); ppPoolDefaults[SCHATTR_AXIS_POSITION_VALUE - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_POSITION_VALUE); - ppPoolDefaults[SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT,0); + ppPoolDefaults[SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT - SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT,0); ppPoolDefaults[SCHATTR_AXIS_LABEL_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_LABEL_POSITION,0); ppPoolDefaults[SCHATTR_AXIS_MARK_POSITION - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MARK_POSITION,0); - ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH); - ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0); - ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0); - ppPoolDefaults[SCHATTR_SYMBOL_SIZE - SCHATTR_START] = new SvxSizeItem(SCHATTR_SYMBOL_SIZE,Size(0,0)); + ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH); + ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0); + ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0); + ppPoolDefaults[SCHATTR_SYMBOL_SIZE - SCHATTR_START] = new SvxSizeItem(SCHATTR_SYMBOL_SIZE,Size(0,0)); // new for New Chart - ppPoolDefaults[SCHATTR_BAR_OVERLAP - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0); - ppPoolDefaults[SCHATTR_BAR_GAPWIDTH - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0); - ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, FALSE); + ppPoolDefaults[SCHATTR_BAR_OVERLAP - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0); + ppPoolDefaults[SCHATTR_BAR_GAPWIDTH - SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0); + ppPoolDefaults[SCHATTR_BAR_CONNECT - SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, FALSE); ppPoolDefaults[SCHATTR_NUM_OF_LINES_FOR_BAR - SCHATTR_START] = new SfxInt32Item( SCHATTR_NUM_OF_LINES_FOR_BAR, 0 ); ppPoolDefaults[SCHATTR_SPLINE_ORDER - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 ); ppPoolDefaults[SCHATTR_SPLINE_RESOLUTION - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 ); diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index b8ee9910ce2d..920b334353b9 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -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 @@ -35,7 +35,7 @@ namespace chart class ChartItemPool : public SfxItemPool { private: - SfxPoolItem** ppPoolDefaults; + SfxPoolItem** ppPoolDefaults; SfxItemInfo* pItemInfos; public: diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 2347824664c5..3a556901a240 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -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 @@ -256,7 +256,7 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre return; // creating the graphic exporter - uno::Reference< document::XExporter > xExporter( xFactory->createInstance( + uno::Reference< document::XExporter > xExporter( xFactory->createInstance( C2U("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY); uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY ); @@ -277,8 +277,8 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre aFilterData[1].Value <<= bUseHighContrast; aFilterData[2].Name = C2U("Version"); - const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; - aFilterData[2].Value <<= nVersion; + const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; + aFilterData[2].Value <<= nVersion; aFilterData[3].Name = C2U("CurrentPage"); aFilterData[3].Value <<= uno::Reference< uno::XInterface >( m_xDrawPage, uno::UNO_QUERY ); @@ -322,7 +322,7 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF SvMemoryStream aStream( 1024, 1024 ); utl::OStreamWrapper* pStreamWrapper = new utl::OStreamWrapper( aStream ); - + uno::Reference< io::XOutputStream > xOutStream( pStreamWrapper ); uno::Reference< io::XInputStream > xInStream( pStreamWrapper ); uno::Reference< io::XSeekable > xSeekable( pStreamWrapper ); @@ -330,13 +330,13 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF if( xOutStream.is() ) { this->getMetaFile( xOutStream, bHighContrastMetaFile ); - + if( xInStream.is() && xSeekable.is() ) { xSeekable->seek(0); sal_Int32 nBytesToRead = xInStream->available(); uno::Sequence< sal_Int8 > aSeq( nBytesToRead ); - xInStream->readBytes( aSeq, nBytesToRead); + xInStream->readBytes( aSeq, nBytesToRead); aRet <<= aSeq; xInStream->closeInput(); } @@ -455,7 +455,7 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis typedef std::pair< VCoordinateSystem* , tFullAxisIndex > tFullCoordinateSystem; typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap; - + struct AxisUsage { AxisUsage(); @@ -659,7 +659,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( // - create plotter for charttypes (for each first scale group at each plotter, as they are independent) // - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling) // - add plotter to coordinate systems - + //iterate through all coordinate systems uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); OSL_ASSERT( xCooSysContainer.is()); @@ -695,7 +695,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( pPlotter->setColorScheme( xColorScheme ); pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() ); sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType ); - + if(pVCooSys) pVCooSys->addMinimumAndMaximumSupplier(pPlotter); @@ -911,7 +911,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel { //precondition: need a initialized m_aSeriesPlotterList //precondition: need a initialized m_aAxisUsageList - + ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); @@ -927,7 +927,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel AxisUsage& rAxisUsage = (*aAxisIter).second; ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex); - + for( nC=0; nC < aVCooSysList_X.size(); nC++) aVCooSysList_X[nC]->prepareScaleAutomatismForDimensionAndIndex(rAxisUsage.aScaleAutomatism,0,nAxisIndex); for( nC=0; nC < aVCooSysList_Z.size(); nC++) @@ -956,7 +956,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems(1,nAxisIndex); ::std::vector< VCoordinateSystem* > aVCooSysList_Z = rAxisUsage.getCoordinateSystems(2,nAxisIndex); - + if(!aVCooSysList_Y.size()) continue; @@ -966,7 +966,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel ExplicitScaleData aExplicitScale; ExplicitIncrementData aExplicitIncrement; rAxisUsage.aScaleAutomatism.calculateExplicitScaleAndIncrement( aExplicitScale, aExplicitIncrement ); - + for( nC=0; nC < aVCooSysList_X.size(); nC++) aVCooSysList_X[nC]->setExplicitScaleAndIncrement( 0, nAxisIndex, aExplicitScale, aExplicitIncrement ); for( nC=0; nC < aVCooSysList_Y.size(); nC++) @@ -993,7 +993,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex ); if( !aVCooSysList_Y.size() ) continue; - + uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if( xDiagram.is() ) { @@ -1004,7 +1004,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); aIter++ ) { - sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); + sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); if( nAxisIndex == nCurrentIndex ) { bSeriesAttachedToThisAxis = true; @@ -1014,7 +1014,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: nAttachedAxisIndex=nCurrentIndex; } } - + if( !bSeriesAttachedToThisAxis && nAttachedAxisIndex >= 0 ) { for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC ) @@ -1033,7 +1033,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType; aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue; - + ScaleData aScale( rAxisUsage.aScaleAutomatism.getScale() ); if( !aScale.Minimum.hasValue() ) { @@ -1044,7 +1044,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( bNewMinOK ) aExplicitScaleDest.Minimum = aExplicitScaleSource.Minimum; } - else + else aExplicitIncrementDest.BaseValue = aExplicitScaleDest.Minimum; if( !aScale.Maximum.hasValue() ) @@ -1054,10 +1054,10 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( aScale.Minimum >>= fMin ) bNewMaxOK = (fMin <= aExplicitScaleSource.Maximum); if( bNewMaxOK ) - aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum; + aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum; } if( !aScale.Origin.hasValue() ) - aExplicitScaleDest.Origin = aExplicitScaleSource.Origin; + aExplicitScaleDest.Origin = aExplicitScaleSource.Origin; if( !aScale.IncrementData.Distance.hasValue() ) aExplicitIncrementDest.Distance = aExplicitIncrementSource.Distance; @@ -1068,7 +1068,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: if( bAutoMinorInterval ) { if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() ) - aExplicitIncrementDest.SubIncrements[0].IntervalCount = + aExplicitIncrementDest.SubIncrements[0].IntervalCount = aExplicitIncrementSource.SubIncrements[0].IntervalCount; } @@ -1158,7 +1158,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio() fz = fy*aSingleRatio.DirectionZ/aSingleRatio.DirectionY; else fz = aSingleRatio.DirectionZ; - } + } if( fx>0 && fy>0 && fz>0 ) break; @@ -1216,7 +1216,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod if( xPageStyles.is() ) { rtl::OUString aPageStyle; - + uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY ); if( xTextDocument.is() ) { @@ -1275,7 +1275,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod } if( !aPageStyle.getLength() ) { - uno::Reference< text::XText > xText( xTextDocument->getText() ); + uno::Reference< text::XText > xText( xTextDocument->getText() ); if( xText.is() ) { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); @@ -1319,7 +1319,7 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp { sal_Int16 nWritingMode = text::WritingMode2::LR_TB; if( pDrawModelWrapper.get() ) - { + { const SfxPoolItem* pItem = &(pDrawModelWrapper->GetItemPool().GetDefaultItem( EE_PARA_WRITINGDIR )); if( pItem ) nWritingMode = static_cast< sal_Int16 >((static_cast< const SfxInt32Item * >( pItem ))->GetValue()); @@ -1340,7 +1340,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& , const uno::Reference< drawing::XShape>& xDiagram_MarkHandles /*needs to be resized to fit the result*/ ) { - //return the used rectangle + //return the used rectangle awt::Rectangle aUsedOuterRect( rAvailablePos.X, rAvailablePos.Y, 0, 0 ); // sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported @@ -1380,9 +1380,9 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ); } - + // - prepare list of all axis and how they are used - rSeriesPlotterContainer.initAxisUsageList(); + rSeriesPlotterContainer.initAxisUsageList(); rSeriesPlotterContainer.doAutoScaling( m_xChartModel ); rSeriesPlotterContainer.setScalesFromCooSysToPlotter(); rSeriesPlotterContainer.setNumberFormatsFromAxes(); @@ -1394,7 +1394,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& //aspect ratio drawing::Direction3D aPreferredAspectRatio( rSeriesPlotterContainer.getPreferredAspectRatio() ); - + uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(0); uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(0); VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); @@ -1409,7 +1409,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& uno::Reference< drawing::XShapes > xTextTargetShapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxes_Shapes) ); // - create axis and grids for all coordinate systems - + //init all coordinate systems for( nC=0; nC < rVCooSysList.size(); nC++) { @@ -1426,7 +1426,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& uno::Reference< drawing::XShape > xBoundingShape( xDiagramPlusAxes_Shapes, uno::UNO_QUERY ); ::basegfx::B2IRectangle aConsumedOuterRect; - + //use first coosys only so far; todo: calculate for more than one coosys if we have more in future //todo: this is just a workaround at the moment for pie and donut labels bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); @@ -1434,7 +1434,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& { VCoordinateSystem* pVCooSys = rVCooSysList[0]; pVCooSys->createMaximumAxesLabels(); - + aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) ); ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() ); if( !bUseFixedInnerSize ) @@ -1474,10 +1474,10 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& for( nC=0; nC < rVCooSysList.size(); nC++) { VCoordinateSystem* pVCooSys = rVCooSysList[nC]; - + pVCooSys->setTransformationSceneToScreen( B3DHomMatrixToHomogenMatrix( createTransformationSceneToScreen( aVDiagram.getCurrentRectangle() ) )); - + pVCooSys->createAxesShapes(); pVCooSys->createGridShapes(); } @@ -1525,7 +1525,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ::basegfx::B2IRectangle aNewInnerRect( aVDiagram.getCurrentRectangle() ); if( !bUseFixedInnerSize ) aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect ); - + for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ ) { VSeriesPlotter* pSeriesPlotter = *aPlotterIter; @@ -1536,7 +1536,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ShapeFactory::removeSubShapes( xSeriesTargetInFrontOfAxis ); //xSeriesTargetBehindAxis is a sub shape of xSeriesTargetInFrontOfAxis and will be removed here xSeriesTargetBehindAxis.clear(); ShapeFactory::removeSubShapes( xTextTargetShapes ); - + //set new transformation for( nC=0; nC < rVCooSysList.size(); nC++) { @@ -1653,7 +1653,7 @@ sal_Bool ChartView::getExplicitValuesForAxis( if(!xAxis.is()) return sal_False; - + uno::Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis(xAxis,ChartModelHelper::findDiagram( m_xChartModel ) ) ); const VCoordinateSystem* pVCooSys = findInCooSysList(m_aVCooSysList,xCooSys); if(!pVCooSys) @@ -1690,7 +1690,7 @@ uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() ); - if( pObj ) + if( pObj ) return uno::Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY); return 0; } @@ -1827,7 +1827,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis( bool bNumberFormatKeyFoundViaAttachedData = false; sal_Int32 nAxisIndex = 0; sal_Int32 nDimensionIndex = 1; - + try { Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW ); @@ -1944,7 +1944,7 @@ sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference< util:: { sal_Bool bCreate = sal_True; const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); - Sequence aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, + Sequence aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, rLocaleDataWrapper.getLocale(), bCreate ); if( aKeySeq.getLength() ) { @@ -1964,9 +1964,9 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( { sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) - return nFormat; + return nFormat; - rtl::OUString aPropName( C2U( "NumberFormat" ) ); + rtl::OUString aPropName( C2U( "NumberFormat" ) ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -2004,7 +2004,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe { sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) - return nFormat; + return nFormat; if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) ) { nFormat = ExplicitValueProvider::getPercentNumberFormat( xNumberFormatsSupplier ); @@ -2182,7 +2182,7 @@ bool getAvailablePosAndSizeForDiagram( bool bPosSizeExcludeAxes = false; if( xProp.is() ) xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes; - + //size: ::com::sun::star::chart2::RelativeSize aRelativeSize; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) @@ -2463,7 +2463,7 @@ void formatPage( if( ! xModelPage.is()) return; - + if( !xShapeFactory.is() ) return; @@ -2627,7 +2627,7 @@ void ChartView::createShapes() { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + //------------ apply fill properties to page // todo: it would be nicer to just pass the page m_xDrawPage and format it, // but the draw page does not support XPropertySet @@ -2650,7 +2650,7 @@ void ChartView::createShapes() ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") ); uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) ); - + //------------ create some titles std::auto_ptr apVTitle(0); bool bAutoPositionDummy = true; @@ -2740,7 +2740,7 @@ void ChartView::createShapes() awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent( aSeriesPlotterContainer , xDiagramPlusAxes_Shapes , aAvailablePosDia ,aAvailableSizeForDiagram, aPageSize, bUseFixedInnerSize, xDiagram_MarkHandles ); - + if( xDiagram_OuterRect.is() ) { xDiagram_OuterRect->setPosition( awt::Point( aUsedOuterRect.X, aUsedOuterRect.Y ) ); @@ -2775,7 +2775,7 @@ void ChartView::createShapes() #if OSL_DEBUG_LEVEL > 0 clock_t nEnd = clock(); double fDuration =(double(nEnd-nStart)*1000.0)/double(CLOCKS_PER_SEC); - + OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< chart view :: createShapes():: needed %f msec", fDuration ); #endif } @@ -2822,7 +2822,7 @@ void ChartView::impl_updateView() m_bViewDirty = false; m_bViewUpdatePending = false; createShapes(); - + if( m_bViewDirty ) { //avoid recursions due to add-in @@ -2926,7 +2926,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) if( ChartView::getSdrPage() != pSdrHint->GetPage() ) bShapeChanged=false; } - + if(!bShapeChanged) return; diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index 476adae03674..1a37be330077 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -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 @@ -75,9 +75,9 @@ class ChartView : public ::cppu::WeakImplHelper9< , ::com::sun::star::datatransfer::XTransferable ,::com::sun::star::lang::XUnoTunnel //::com::sun::star::lang::XComponent ??? - //::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - //::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - //::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + //::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + //::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + //::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::util::XModifyListener ,::com::sun::star::util::XModeChangeBroadcaster ,::com::sun::star::util::XUpdatable @@ -165,7 +165,7 @@ public: virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory //----------------------------------------------------------------- @@ -237,7 +237,7 @@ private: //member bool volatile m_bViewDirty; //states wether the view needs to be rebuild bool volatile m_bInViewUpdate; bool volatile m_bViewUpdatePending; - bool volatile m_bRefreshAddIn; + bool volatile m_bRefreshAddIn; //better performance for big data ::com::sun::star::awt::Size m_aPageResolution; diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index e61096e5a0ba..6621969d15d4 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -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 @@ -49,7 +49,7 @@ using ::basegfx::B2DTuple; //----------------------------------------------------------------------------- namespace{ -/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric +/** @descr This is a supporting function for lcl_clip2d. It computes a new parametric value for an entering (dTE) or leaving (dTL) intersection point with one of the edges bounding the clipping area. For explanation of the parameters please refer to : @@ -61,83 +61,83 @@ namespace{ */ bool lcl_CLIPt(double fDenom,double fNum, double & fTE, double & fTL) { - double fT; - - if (fDenom > 0) // Intersection enters: PE + double fT; + + if (fDenom > 0) // Intersection enters: PE { - fT = fNum / fDenom; // Parametric value at the intersection. - if (fT > fTL) // fTE and fTL crossover - return false; // therefore reject the line. - else if (fT > fTE) // A new fTE has been found. + fT = fNum / fDenom; // Parametric value at the intersection. + if (fT > fTL) // fTE and fTL crossover + return false; // therefore reject the line. + else if (fT > fTE) // A new fTE has been found. fTE = fT; } - else if (fDenom < 0) // Intersection leaves: PL + else if (fDenom < 0) // Intersection leaves: PL { - fT = fNum / fDenom; // Parametric Value at the intersection. - if (fT < fTE) // fTE and fTL crossover - return false; // therefore reject the line. - else if (fT < fTL) // A new fTL has been found. + fT = fNum / fDenom; // Parametric Value at the intersection. + if (fT < fTE) // fTE and fTL crossover + return false; // therefore reject the line. + else if (fT < fTL) // A new fTL has been found. fTL = fT; } else if (fNum > 0) - return false; // Line lies on the outside of the edge. - + return false; // Line lies on the outside of the edge. + return true; } -/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle +/** @descr The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle rRectangle. If there is at least a part of it visible then TRUE is returned and the endpoints of that part are stored in rP0 and rP1. The points rP0 and rP1 may have the same coordinates. - @param rP0 Start point of the line to clip. Modified to contain a start point inside + @param rP0 Start point of the line to clip. Modified to contain a start point inside the clipping area if possible. - @param rP1 End point of the line to clip. Modified to contain an end point inside + @param rP1 End point of the line to clip. Modified to contain an end point inside the clipping area if possible. - @param rRectangle Clipping area. - @return If the line lies completely or partly inside the clipping area then TRUE + @param rRectangle Clipping area. + @return If the line lies completely or partly inside the clipping area then TRUE is returned. If the line lies completely outside then FALSE is returned and rP0 and rP1 are left unmodified. */ bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRectangle) { - //Direction vector of the line. + //Direction vector of the line. B2DTuple aDirection = rPoint1 - rPoint0; if( aDirection.getX()==0 && aDirection.getY()==0 && rRectangle.isInside(rPoint0) ) { - // Degenerate case of a zero length line. + // Degenerate case of a zero length line. return true; } else { - // Values of the line parameter where the line enters resp. leaves the rectangle. + // Values of the line parameter where the line enters resp. leaves the rectangle. double fTE = 0, fTL = 1; - - // Test wether at least a part lies in the four half-planes with respect to - // the rectangles four edges. + + // Test wether at least a part lies in the four half-planes with respect to + // the rectangles four edges. if( lcl_CLIPt(aDirection.getX(), rRectangle.getMinX() - rPoint0.getX(), fTE, fTL) ) if( lcl_CLIPt(-aDirection.getX(), rPoint0.getX() - rRectangle.getMaxX(), fTE, fTL) ) if( lcl_CLIPt(aDirection.getY(), rRectangle.getMinY() - rPoint0.getY(), fTE, fTL) ) if( lcl_CLIPt(-aDirection.getY(), rPoint0.getY() - rRectangle.getMaxY(), fTE, fTL) ) { - // At least a part is visible. + // At least a part is visible. if (fTL < 1) { - // Compute the new end point. + // Compute the new end point. rPoint1.setX( rPoint0.getX() + fTL * aDirection.getX() ); rPoint1.setY( rPoint0.getY() + fTL * aDirection.getY() ); } if (fTE > 0) { - // Compute the new starting point. + // Compute the new starting point. rPoint0.setX( rPoint0.getX() + fTE * aDirection.getX() ); rPoint0.setY( rPoint0.getY() + fTE * aDirection.getY() ); } return true; } - - // Line is not visible. + + // Line is not visible. return false; } } @@ -220,7 +220,7 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg if(!rPolygon.SequenceX.getLength()) return; - + //need clipping?: { ::basegfx::B3DRange a3DRange( BaseGFXHelper::getBoundVolume( rPolygon ) ); diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index d59a011cd429..baf597dd214b 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -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 @@ -51,7 +51,7 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( xTarget->add(xGroup); uno::Reference< drawing::XShapes > xGroupShapes = uno::Reference( xGroup, uno::UNO_QUERY ); - + ShapeFactory aShapeFactory(xShapeFactory); drawing::Position3D aPos(0,0,0); for(sal_Int32 nS=0;nStransformToAngleDegree( fStartLogicValueOnAngleAxis ); double fEndAngleDegree = this->transformToAngleDegree( fEndLogicValueOnAngleAxis ); double fWidthAngleDegree = fEndAngleDegree - fStartAngleDegree; - + if( ::rtl::math::approxEqual( fStartAngleDegree, fEndAngleDegree ) && !::rtl::math::approxEqual( fStartLogicValueOnAngleAxis, fEndLogicValueOnAngleAxis ) ) fWidthAngleDegree = 360.0; - + while(fWidthAngleDegree<0.0) fWidthAngleDegree+=360.0; while(fWidthAngleDegree>360.0) @@ -524,7 +524,7 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu double fY = m_bSwapXAndY ? getLogicMaxY() : fLogicValueOnRadiusAxis; if(bDoScaling) doLogicScaling( &fX, &fY, 0 ); - + fScaledLogicRadiusValue = m_bSwapXAndY ? fX : fY; bool bMinIsInnerRadius = true; @@ -544,7 +544,7 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu double fMin = m_bSwapXAndY ? MinX : MinY; double fMax = m_bSwapXAndY ? MaxX : MaxY; - + fInnerScaledLogicRadius = bMinIsInnerRadius ? fMin : fMax; fOuterScaledLogicRadius = bMinIsInnerRadius ? fMax : fMin; } @@ -596,7 +596,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou default: //NormalAxis_Z break; } - + //!! applying matrix to vector does ignore translation, so it is important to use a B3DPoint here instead of B3DVector ::basegfx::B3DPoint aPoint(fX,fY,fZ); ::basegfx::B3DPoint aRet = m_aUnitCartesianToScene * aPoint; @@ -606,7 +606,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling ) const { double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); - double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); + double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ, bDoScaling ); } diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 8e5402b48d63..c5be5aae4560 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -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,7 +66,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForLogicV { double fUnitCircleAngleDegree = m_pPosHelper->transformToAngleDegree( fLogicValueOnAngleAxis ); double fUnitCircleRadius = m_pPosHelper->transformToRadius( fLogicValueOnRadiusAxis ); - + return getLabelScreenPositionAndAlignmentForUnitCircleValues( rAlignment, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE , fUnitCircleAngleDegree, 0.0 @@ -82,7 +82,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi { bool bCenter = (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) && (nLabelPlacement != ::com::sun::star::chart::DataLabelPlacement::INSIDE); - + double fAngleDegree = fUnitCircleStartAngleDegree + fUnitCircleWidthAngleDegree/2.0; double fRadius = 0.0; if( !bCenter ) //e.g. for pure pie chart(one ring only) or for angle axis of polyar coordinate system @@ -92,7 +92,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi awt::Point aRet( this->transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) ); - + if(3==m_nDimensionCount && nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) { //check wether the upper or the downer edge is more distant from the center diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 1979582763fa..4fc2ad83d5b9 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -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 @@ -208,7 +208,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper // ( C2U( "CharEscapement" ), C2U("CharEscapement") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import // ( C2U( "CharEscapementHeight" ), C2U("CharEscapementHeight") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import // ( C2U( "CharFlash" ), C2U("Flashing") ) - + ( C2U( "CharFontFamily" ), C2U("CharFontFamily") ) ( C2U( "CharFontFamilyAsian" ), C2U("CharFontFamilyAsian") ) ( C2U( "CharFontFamilyComplex" ), C2U("CharFontFamilyComplex") ) @@ -224,7 +224,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper ( C2U( "CharFontStyleName" ), C2U("CharFontStyleName") ) ( C2U( "CharFontStyleNameAsian" ), C2U("CharFontStyleNameAsian") ) ( C2U( "CharFontStyleNameComplex" ),C2U("CharFontStyleNameComplex") ) - + ( C2U( "CharHeight" ), C2U("CharHeight") ) ( C2U( "CharHeightAsian" ), C2U("CharHeightAsian") ) ( C2U( "CharHeightComplex" ), C2U("CharHeightComplex") ) @@ -250,7 +250,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper ( C2U( "CharWordMode" ), C2U("CharWordMode") ) ( C2U( "WritingMode" ), C2U("WritingMode") ) - + // ( C2U( "RubyText" ), C2U("RubyText") ) // ( C2U( "RubyAdjust" ), C2U("RubyAdjust") ) // ( C2U( "RubyCharStyleName" ), C2U("RubyStyleName") ) @@ -442,7 +442,7 @@ void PropertyMapper::setMultiProperties( { aPropName = rNames[nN]; aValue = rValues[nN]; - + try { xTarget->setPropertyValue( aPropName, aValue ); diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 721cabd15d83..e4985fdaf5fe 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -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 @@ -192,7 +192,7 @@ uno::Any createPolyPolygon_Cube( const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0; - const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety + const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety const bool bRoundEdges = fRoundedEdge && fOffset < fWidthH && 2.0 * fOffset < fHeightSign*fHeight; const sal_Int32 nPointCount = bRoundEdges ? 13 : 5; @@ -631,7 +631,7 @@ uno::Reference bool bInvertPolygon = false; bool bInvertNormals = false; - + if(bRotateZ) { //bars @@ -678,7 +678,7 @@ uno::Reference aStripe3 = Stripe( aBottomP3, aTopP3, aTopP4, aBottomP4 ); aStripe4 = Stripe( aBottomP4, aTopP4, aTopP1, aBottomP1 ); } - + Stripe aNormalsStripe1( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP2, aNormalsTopP2 ); Stripe aNormalsStripe2( aNormalsTopP2, aNormalsBottomP2, aNormalsBottomP3, aNormalsTopP3 ); Stripe aNormalsStripe3( aNormalsTopP3, aNormalsBottomP3, aNormalsBottomP4, aNormalsTopP4 ); @@ -691,12 +691,12 @@ uno::Reference aNormalsStripe3 = Stripe( aNormalsTopP4, aNormalsBottomP4, aNormalsBottomP3, aNormalsTopP3 ); aNormalsStripe4 = Stripe( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP4, aNormalsTopP4 ); } - + aStripe1.SetManualNormal( aNormalsStripe1.getNormal() ); aStripe2.SetManualNormal( aNormalsStripe2.getNormal() ); aStripe3.SetManualNormal( aNormalsStripe3.getNormal() ); aStripe4.SetManualNormal( aNormalsStripe4.getNormal() ); - + const bool bFlatNormals = false; ShapeFactory::createStripe( xGroup, aStripe1, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals ); ShapeFactory::createStripe( xGroup, aStripe2, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals ); @@ -731,7 +731,7 @@ uno::Reference m_xShapeFactory->createInstance( C2U( "com.sun.star.drawing.Shape3DLatheObject") ), uno::UNO_QUERY ); xTarget->add(xShape); - + double fWidth = rSize.DirectionX/2.0; //The depth will be corrrected within Matrix double fRadius = fWidth; //!!!!!!!! problem in drawing layer: rotation object calculates wrong needed size -> wrong camera (it's a problem with bounding boxes) double fHeight = rSize.DirectionY; diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index 2df78e2a8e91..749c4b04b99f 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -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 @@ -133,7 +133,7 @@ uno::Any Stripe::getPolyPolygonShape3D() const drawing::Direction3D Stripe::getNormal() const { drawing::Direction3D aRet(1.0,0.0,0.0); - + if( m_bManualNormalSet ) aRet = m_aManualNormal; else @@ -212,7 +212,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -234,7 +234,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -256,7 +256,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 0.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -288,7 +288,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 1.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; @@ -310,7 +310,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const *pInnerSequenceX++ = 1.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; - + *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = 1.0; *pInnerSequenceZ++ = 0.0; diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 8bb6a11b4baf..44523c05a3d2 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -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 @@ -531,7 +531,7 @@ double VDataSeries::getBubble_Size( sal_Int32 index ) const bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); + rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); bool bHasNumberFormat = false; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); sal_Int32 nNumberFormat = -1; @@ -541,7 +541,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce } sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); + rtl::OUString aPropName( bForPercentage ? C2U( "PercentageNumberFormat" ) : C2U( "NumberFormat" ) ); sal_Int32 nNumberFormat = -1; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) @@ -628,7 +628,7 @@ double VDataSeries::getMinimumofAllDifferentYValues( sal_Int32 index ) const double fY_Max = getY_Max( index ); double fY_First = getY_First( index ); double fY_Last = getY_Last( index ); - + if(fMin>fY_First) fMin=fY_First; if(fMin>fY_Last) @@ -664,7 +664,7 @@ double VDataSeries::getMaximumofAllDifferentYValues( sal_Int32 index ) const double fY_Max = getY_Max( index ); double fY_First = getY_First( index ); double fY_Last = getY_Last( index ); - + if(fMax xSymbol( rEntries[ nEntry ].aSymbol ); @@ -757,7 +757,7 @@ void VLegend::createShapes( } bool bSymbolsLeftSide = lcl_shouldSymbolsBePlacedOnTheLeftSide( xLegendProp, m_nDefaultWritingMode ); - + // place entries awt::Size aLegendSize; lcl_placeLegendEntries( aViewEntries, eExpansion, bSymbolsLeftSide diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 9587b50f71e7..08c79404b3bb 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -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 @@ -89,7 +89,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > m_xLegend; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 958a8defe0b6..13200fc2d1e4 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -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 @@ -247,7 +247,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( xResultGroup->add( xLine ); xLine->setSize( awt::Size( 0, 2000 )); xLine->setPosition( awt::Point( 1500, 0 )); - + lcl_setPropetiesToShape( xLegendEntryProperties, xLine, ePropertyType ); // PROP_TYPE_LINE_SERIES ); } } diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index dc8409a6891d..d131023a06c5 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -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 @@ -100,7 +100,7 @@ bool VLineProperties::isLineVisible() const bRet = true; } } - + return bRet; } diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index fd3037316cc6..9d82b289b046 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -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 @@ -60,18 +60,18 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; - + if( m_aPositionHelper.isSwapXAndY() ) std::swap(fScaledLogicAngle,fScaledLogicRadius); double fAngleDegree = m_aPositionHelper.transformToAngleDegree( fScaledLogicAngle, false ); double fAnglePi = fAngleDegree*F_PI/180.0; - double fRadius = m_aPositionHelper.transformToRadius( fScaledLogicRadius, false); + double fRadius = m_aPositionHelper.transformToRadius( fScaledLogicRadius, false); double fX=fRadius*cos(fAnglePi); double fY=fRadius*sin(fAnglePi); double fZ=rSourceValues[2]; - + //!! applying matrix to vector does ignore translation, so it is important to use a B3DPoint here instead of B3DVector ::basegfx::B3DPoint aPoint(fX,fY,fZ); ::basegfx::B3DPoint aRet = m_aUnitCartesianToScene * aPoint; diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index f62142735b7c..854b78503f77 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -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 @@ -209,7 +209,7 @@ void VTitle::createShapes( xTextCursor->gotoEnd(true); uno::Reference< beans::XPropertySet > xTargetProps( xShape, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xSourceProps( aStringList[0], uno::UNO_QUERY ); - + PropertyMapper::setMappedProperties( xTargetProps, xSourceProps , PropertyMapper::getPropertyNameMapForCharacterProperties() ); diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 8a6e7d6e4f16..f4047e671f1b 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -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 @@ -64,7 +64,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; + ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 26f8b9d7cf7e..6f384df19295 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -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/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 788dac2fc90b..c609d2daa52b 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -116,7 +116,7 @@ - + diff --git a/chart2/uiconfig/toolbar/arrowshapes.xml b/chart2/uiconfig/toolbar/arrowshapes.xml index 4a53519494ea..17b654bd2b25 100644 --- a/chart2/uiconfig/toolbar/arrowshapes.xml +++ b/chart2/uiconfig/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ - - - + + + - - - - - - + + + + + + - - + + \ No newline at end of file diff --git a/chart2/uiconfig/toolbar/basicshapes.xml b/chart2/uiconfig/toolbar/basicshapes.xml index e65778305788..bd4b96708264 100644 --- a/chart2/uiconfig/toolbar/basicshapes.xml +++ b/chart2/uiconfig/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ - - - + + + - - - - + + + + \ No newline at end of file diff --git a/chart2/uiconfig/toolbar/flowchartshapes.xml b/chart2/uiconfig/toolbar/flowchartshapes.xml index bb1d1099dbd4..556445479b6e 100644 --- a/chart2/uiconfig/toolbar/flowchartshapes.xml +++ b/chart2/uiconfig/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ - - - + + + - - - - - - + + + + + + - - - - + + + + \ No newline at end of file diff --git a/chart2/uiconfig/toolbar/symbolshapes.xml b/chart2/uiconfig/toolbar/symbolshapes.xml index 0fa6aee313db..272a9dbba702 100644 --- a/chart2/uiconfig/toolbar/symbolshapes.xml +++ b/chart2/uiconfig/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ - - - + + + \ No newline at end of file diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index a986dd9557c7..a7f7783e99f0 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -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 @@ -101,7 +101,7 @@ void * SAL_CALL component_getFactory( return pRet; } -} // extern C +} // extern C // -------------------- @@ -110,7 +110,7 @@ void * SAL_CALL component_getFactory( SampleAddIn::SampleAddIn() { - + } SampleAddIn::~SampleAddIn() @@ -151,7 +151,7 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx if( bVertical ) { aOutPosition.X = aPos.X; - aOutPosition.Y = static_cast(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom + aOutPosition.Y = static_cast(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom } else { @@ -294,7 +294,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) { uno::Any aColor, aWidth; aColor <<= (sal_Int32)(0xe01010); - aWidth <<= (sal_Int32)(50); // 0.5 mm + aWidth <<= (sal_Int32)(50); // 0.5 mm try { xShapeProp->setPropertyValue( OUString::createFromAscii( "LineColor" ), aColor ); @@ -314,9 +314,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) // change text OUString aText; -// if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE"))) -// aText = OUString::createFromAscii( "Kleines Beispiel" ); -// else +// if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE"))) +// aText = OUString::createFromAscii( "Kleines Beispiel" ); +// else aText = OUString::createFromAscii( "Little Example" ); uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY ); @@ -354,9 +354,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) // get row count == length of each series sal_Int32 nSize = aData.getLength(); sal_Int32 nMiddle = nSize / 2; - // get value for first series - double fMiddleVal = xData->getNotANumber(); // set to NaN - if( aData[ nMiddle ].getLength()) // we have at least one series + // get value for first series + double fMiddleVal = xData->getNotANumber(); // set to NaN + if( aData[ nMiddle ].getLength()) // we have at least one series fMiddleVal = aData[ nMiddle ][ 0 ]; awt::Point aPos; @@ -394,28 +394,28 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) } // set axis scale to 200 -// uno::Reference< beans::XPropertySet > xXAxis( getXAxis(), uno::UNO_QUERY ); -// if( xXAxis.is()) -// { -// uno::Any aAny; -// aAny <<= (sal_Bool)(sal_False); -// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ), -// aAny ); -// aAny <<= (double)(200.0); -// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ), -// aAny ); -// } +// uno::Reference< beans::XPropertySet > xXAxis( getXAxis(), uno::UNO_QUERY ); +// if( xXAxis.is()) +// { +// uno::Any aAny; +// aAny <<= (sal_Bool)(sal_False); +// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ), +// aAny ); +// aAny <<= (double)(200.0); +// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ), +// aAny ); +// } // try setting symbols -// uno::Reference< beans::XPropertySet > xProp = getDataRowProperties( 0 ); -// if( xProp.is()) -// { -// uno::Any aAny; -// aAny <<= (sal_Int32)(-1); -// xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny ); -// aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" ); -// xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny ); -// } +// uno::Reference< beans::XPropertySet > xProp = getDataRowProperties( 0 ); +// if( xProp.is()) +// { +// uno::Any aAny; +// aAny <<= (sal_Int32)(-1); +// xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny ); +// aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" ); +// xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny ); +// } } void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >& ) diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx index 59b1ab32c8f1..91de93f64628 100644 --- a/chart2/workbench/addin/sampleaddin.hxx +++ b/chart2/workbench/addin/sampleaddin.hxx @@ -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 @@ -70,7 +70,7 @@ public: virtual ~SampleAddIn(); // class specific code - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); sal_Bool getLogicalPosition( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xAxis, @@ -158,4 +158,4 @@ public: throw( ::com::sun::star::uno::RuntimeException ); }; -#endif // _SAMPLEADDIN_HXX_ +#endif // _SAMPLEADDIN_HXX_ diff --git a/sc/addin/datefunc/dfa.src b/sc/addin/datefunc/dfa.src index 6a38f3068cc5..aa804e705596 100644 --- a/sc/addin/datefunc/dfa.src +++ b/sc/addin/datefunc/dfa.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 diff --git a/sc/addin/inc/addin.h b/sc/addin/inc/addin.h index 419d0e3a59db..69cda0b102c1 100644 --- a/sc/addin/inc/addin.h +++ b/sc/addin/inc/addin.h @@ -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 @@ -40,10 +40,10 @@ #undef NULL #define NULL 0 -typedef unsigned char BOOL; -typedef unsigned char BYTE; -typedef unsigned short USHORT; -typedef unsigned long ULONG; +typedef unsigned char BOOL; +typedef unsigned char BYTE; +typedef unsigned short USHORT; +typedef unsigned long ULONG; #endif @@ -53,7 +53,7 @@ typedef unsigned long ULONG; #endif /* all character string returns are limited to 255+1 chars */ -#define SO_CHARSTRING_MAX 256 +#define SO_CHARSTRING_MAX 256 #define SO_StringCopy( dst, src ) \ (strncpy( dst, src, SO_CHARSTRING_MAX ), dst[SO_CHARSTRING_MAX-1] = '\0') @@ -69,14 +69,14 @@ typedef enum #ifndef WIN #ifdef WNT -#define CALLTYPE __cdecl +#define CALLTYPE __cdecl #else #define CALLTYPE #endif #else -#define PASCAL _pascal -#define FAR _far -#define CALLTYPE FAR PASCAL +#define PASCAL _pascal +#define FAR _far +#define CALLTYPE FAR PASCAL #endif diff --git a/sc/addin/inc/dfa.hrc b/sc/addin/inc/dfa.hrc index 0d2af4f4bffd..6d39c7fa2ee6 100644 --- a/sc/addin/inc/dfa.hrc +++ b/sc/addin/inc/dfa.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 diff --git a/sc/addin/inc/rot13.hrc b/sc/addin/inc/rot13.hrc index a610c9cc6663..ee87d4ca324c 100644 --- a/sc/addin/inc/rot13.hrc +++ b/sc/addin/inc/rot13.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 diff --git a/sc/addin/rot13/rot13.src b/sc/addin/rot13/rot13.src index 5518ae0aa31f..63165c44c985 100644 --- a/sc/addin/rot13/rot13.src +++ b/sc/addin/rot13/rot13.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 diff --git a/sc/addin/util/cl2c.pl b/sc/addin/util/cl2c.pl index 6f5d3ee7e0d8..fb885284bfed 100644 --- a/sc/addin/util/cl2c.pl +++ b/sc/addin/util/cl2c.pl @@ -3,7 +3,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 @@ -72,7 +72,7 @@ sub makeneutral { print COUT "\n"; print COUT "\t/* ignore LANGUAGE_USER* */\n"; print COUT "\tif ( (nLang & 0x03FF) >= 0x0200 )\n"; - print COUT "\t return nLang;\n"; + print COUT "\t return nLang;\n"; print COUT "\n"; print COUT "\tnLang &= 0x03FF;\n"; print COUT "\n"; diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index df72fec64f57..24184d64e1f5 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -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 @@ -110,7 +110,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index ecf5bdc5ad87..a80899c64231 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -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 @@ -38,7 +38,7 @@ class ScMenuFloatingWindow; typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE; -class ScAccessibleFilterMenuItem : +class ScAccessibleFilterMenuItem : public ScAccessibleContextBase, public ScAccessibleFilterMenuItem_BASE { @@ -54,12 +54,12 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); @@ -69,24 +69,24 @@ public: // XAccessibleAction - virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() + virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) + virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL - getAccessibleActionKeyBinding(sal_Int32 nIndex) + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL + getAccessibleActionKeyBinding(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index 55fcb503f51b..be508e5f98bc 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -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 @@ -62,7 +62,7 @@ public: LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN }; void setAccessibleChild( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rAccessible, ChildControlType eType); diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index a30ebf7ee18c..a8c5f13ab745 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -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 @@ -33,7 +33,7 @@ #include -/** +/** * Generic XAccessibleStateSet implementation. */ class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet > @@ -44,17 +44,17 @@ public: // XAccessibleStateSet - virtual ::sal_Bool SAL_CALL isEmpty() + virtual ::sal_Bool SAL_CALL isEmpty() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) + virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL containsAll( - const ::com::sun::star::uno::Sequence& aStateSet) + const ::com::sun::star::uno::Sequence& aStateSet) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence SAL_CALL getStates() + virtual ::com::sun::star::uno::Sequence SAL_CALL getStates() throw (::com::sun::star::uno::RuntimeException); // Non-UNO Methods diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index f23229d31a43..a729620d57f7 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -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 @@ -31,31 +31,31 @@ // this are the defines for the position of the settings in the // ViewSettingsSequence -#define SC_VIEWSETTINGS_COUNT 23 +#define SC_VIEWSETTINGS_COUNT 23 -#define SC_VIEW_ID 0 -#define SC_TABLE_VIEWSETTINGS 1 -#define SC_ACTIVE_TABLE 2 -#define SC_HORIZONTAL_SCROLL_BAR_WIDTH 3 -#define SC_ZOOM_TYPE 4 -#define SC_ZOOM_VALUE 5 -#define SC_PAGE_VIEW_ZOOM_VALUE 6 -#define SC_PAGE_BREAK_PREVIEW 7 -#define SC_SHOWZERO 8 -#define SC_SHOWNOTES 9 -#define SC_SHOWGRID 10 -#define SC_GRIDCOLOR 11 -#define SC_SHOWPAGEBR 12 -#define SC_COLROWHDR 13 -#define SC_SHEETTABS 14 -#define SC_OUTLSYMB 15 -#define SC_SNAPTORASTER 16 -#define SC_RASTERVIS 17 -#define SC_RASTERRESX 18 -#define SC_RASTERRESY 19 -#define SC_RASTERSUBX 20 -#define SC_RASTERSUBY 21 -#define SC_RASTERSYNC 22 +#define SC_VIEW_ID 0 +#define SC_TABLE_VIEWSETTINGS 1 +#define SC_ACTIVE_TABLE 2 +#define SC_HORIZONTAL_SCROLL_BAR_WIDTH 3 +#define SC_ZOOM_TYPE 4 +#define SC_ZOOM_VALUE 5 +#define SC_PAGE_VIEW_ZOOM_VALUE 6 +#define SC_PAGE_BREAK_PREVIEW 7 +#define SC_SHOWZERO 8 +#define SC_SHOWNOTES 9 +#define SC_SHOWGRID 10 +#define SC_GRIDCOLOR 11 +#define SC_SHOWPAGEBR 12 +#define SC_COLROWHDR 13 +#define SC_SHEETTABS 14 +#define SC_OUTLSYMB 15 +#define SC_SNAPTORASTER 16 +#define SC_RASTERVIS 17 +#define SC_RASTERRESX 18 +#define SC_RASTERRESY 19 +#define SC_RASTERSUBX 20 +#define SC_RASTERSUBY 21 +#define SC_RASTERSYNC 22 // this are the defines for the position of the settings in the @@ -63,46 +63,46 @@ #define SC_TABLE_VIEWSETTINGS_COUNT 15 -#define SC_CURSOR_X 0 -#define SC_CURSOR_Y 1 -#define SC_HORIZONTAL_SPLIT_MODE 2 -#define SC_VERTICAL_SPLIT_MODE 3 -#define SC_HORIZONTAL_SPLIT_POSITION 4 -#define SC_VERTICAL_SPLIT_POSITION 5 -#define SC_ACTIVE_SPLIT_RANGE 6 -#define SC_POSITION_LEFT 7 -#define SC_POSITION_RIGHT 8 -#define SC_POSITION_TOP 9 -#define SC_POSITION_BOTTOM 10 +#define SC_CURSOR_X 0 +#define SC_CURSOR_Y 1 +#define SC_HORIZONTAL_SPLIT_MODE 2 +#define SC_VERTICAL_SPLIT_MODE 3 +#define SC_HORIZONTAL_SPLIT_POSITION 4 +#define SC_VERTICAL_SPLIT_POSITION 5 +#define SC_ACTIVE_SPLIT_RANGE 6 +#define SC_POSITION_LEFT 7 +#define SC_POSITION_RIGHT 8 +#define SC_POSITION_TOP 9 +#define SC_POSITION_BOTTOM 10 #define SC_TABLE_ZOOM_TYPE 11 #define SC_TABLE_ZOOM_VALUE 12 #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13 #define SC_TABLE_TAB_BG_COLOR 14 -#define SC_CURSORPOSITIONX "CursorPositionX" -#define SC_CURSORPOSITIONY "CursorPositionY" -#define SC_HORIZONTALSPLITMODE "HorizontalSplitMode" -#define SC_VERTICALSPLITMODE "VerticalSplitMode" -#define SC_HORIZONTALSPLITPOSITION "HorizontalSplitPosition" -#define SC_VERTICALSPLITPOSITION "VerticalSplitPosition" +#define SC_CURSORPOSITIONX "CursorPositionX" +#define SC_CURSORPOSITIONY "CursorPositionY" +#define SC_HORIZONTALSPLITMODE "HorizontalSplitMode" +#define SC_VERTICALSPLITMODE "VerticalSplitMode" +#define SC_HORIZONTALSPLITPOSITION "HorizontalSplitPosition" +#define SC_VERTICALSPLITPOSITION "VerticalSplitPosition" #define SC_HORIZONTALSPLITPOSITION_TWIPS "HorizontalSplitPositionTwips" #define SC_VERTICALSPLITPOSITION_TWIPS "VerticalSplitPositionTwips" -#define SC_ACTIVESPLITRANGE "ActiveSplitRange" -#define SC_POSITIONLEFT "PositionLeft" -#define SC_POSITIONRIGHT "PositionRight" -#define SC_POSITIONTOP "PositionTop" -#define SC_POSITIONBOTTOM "PositionBottom" +#define SC_ACTIVESPLITRANGE "ActiveSplitRange" +#define SC_POSITIONLEFT "PositionLeft" +#define SC_POSITIONRIGHT "PositionRight" +#define SC_POSITIONTOP "PositionTop" +#define SC_POSITIONBOTTOM "PositionBottom" #define SC_TABLESELECTED "TableSelected" -#define SC_TABLES "Tables" -#define SC_ACTIVETABLE "ActiveTable" -#define SC_HORIZONTALSCROLLBARWIDTH "HorizontalScrollbarWidth" +#define SC_TABLES "Tables" +#define SC_ACTIVETABLE "ActiveTable" +#define SC_HORIZONTALSCROLLBARWIDTH "HorizontalScrollbarWidth" #define SC_RELHORIZONTALTABBARWIDTH "RelativeHorizontalTabbarWidth" -#define SC_ZOOMTYPE "ZoomType" -#define SC_ZOOMVALUE "ZoomValue" -#define SC_PAGEVIEWZOOMVALUE "PageViewZoomValue" +#define SC_ZOOMTYPE "ZoomType" +#define SC_ZOOMVALUE "ZoomValue" +#define SC_PAGEVIEWZOOMVALUE "PageViewZoomValue" #define SC_SHOWPAGEBREAKPREVIEW "ShowPageBreakPreview" -#define SC_VIEWID "ViewId" -#define SC_VIEW "View" +#define SC_VIEWID "ViewId" +#define SC_VIEW "View" #endif diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index 193da4095977..6bac8e59875a 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -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 @@ -37,8 +37,8 @@ class ScAddInCfg : public utl::ConfigItem public: ScAddInCfg(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Commit(); com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) @@ -46,8 +46,8 @@ public: using ConfigItem::GetNodeNames; -// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) -// { return ConfigItem::GetNodeNames( rNode ); } +// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) +// { return ConfigItem::GetNodeNames( rNode ); } }; diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index fbc1444cc6de..7fc6c972d699 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -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 @@ -60,18 +60,18 @@ typedef ::std::hash_map< String, const ScUnoAddInFuncData*, ScStringHashCode, :: enum ScAddInArgumentType { - SC_ADDINARG_NONE, // - - SC_ADDINARG_INTEGER, // long - SC_ADDINARG_DOUBLE, // double - SC_ADDINARG_STRING, // string - SC_ADDINARG_INTEGER_ARRAY, // sequence> - SC_ADDINARG_DOUBLE_ARRAY, // sequence> - SC_ADDINARG_STRING_ARRAY, // sequence> - SC_ADDINARG_MIXED_ARRAY, // sequence> - SC_ADDINARG_VALUE_OR_ARRAY, // any - SC_ADDINARG_CELLRANGE, // XCellRange - SC_ADDINARG_CALLER, // XPropertySet - SC_ADDINARG_VARARGS // sequence + SC_ADDINARG_NONE, // - + SC_ADDINARG_INTEGER, // long + SC_ADDINARG_DOUBLE, // double + SC_ADDINARG_STRING, // string + SC_ADDINARG_INTEGER_ARRAY, // sequence> + SC_ADDINARG_DOUBLE_ARRAY, // sequence> + SC_ADDINARG_STRING_ARRAY, // sequence> + SC_ADDINARG_MIXED_ARRAY, // sequence> + SC_ADDINARG_VALUE_OR_ARRAY, // any + SC_ADDINARG_CELLRANGE, // XCellRange + SC_ADDINARG_CALLER, // XPropertySet + SC_ADDINARG_VARARGS // sequence }; //------------------------------------------------------------------------ @@ -143,16 +143,16 @@ public: class SC_DLLPUBLIC ScUnoAddInCollection { private: - long nFuncCount; - ScUnoAddInFuncData** ppFuncData; + long nFuncCount; + ScUnoAddInFuncData** ppFuncData; ScAddInHashMap* pExactHashMap; // exact internal name ScAddInHashMap* pNameHashMap; // internal name upper ScAddInHashMap* pLocalHashMap; // localized name upper - BOOL bInitialized; + BOOL bInitialized; - void Initialize(); + void Initialize(); void ReadConfiguration(); - void ReadFromAddIn( const com::sun::star::uno::Reference< + void ReadFromAddIn( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xInterface ); void UpdateFromAddIn( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xInterface, @@ -164,7 +164,7 @@ public: ~ScUnoAddInCollection(); /// User enetered name. rUpperName MUST already be upper case! - String FindFunction( const String& rUpperName, BOOL bLocalFirst ); + String FindFunction( const String& rUpperName, BOOL bLocalFirst ); // rName is the exact Name. // Only if bComplete is set, the function reference and argument types @@ -179,15 +179,15 @@ public: void Clear(); - void LocalizeString( String& rName ); // modify rName - input: exact name + void LocalizeString( String& rName ); // modify rName - input: exact name - long GetFuncCount(); - BOOL FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); + long GetFuncCount(); + BOOL FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); static BOOL FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); - BOOL GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); - BOOL GetCalcName( const String& rExcelName, String& rRetCalcName ); + BOOL GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); + BOOL GetCalcName( const String& rExcelName, String& rRetCalcName ); // both leave rRet... unchanged, if no matching name is found }; @@ -195,20 +195,20 @@ public: class ScUnoAddInCall { private: - const ScUnoAddInFuncData* pFuncData; - com::sun::star::uno::Sequence aArgs; - com::sun::star::uno::Sequence aVarArg; - com::sun::star::uno::Reference xCaller; - BOOL bValidCount; + const ScUnoAddInFuncData* pFuncData; + com::sun::star::uno::Sequence aArgs; + com::sun::star::uno::Sequence aVarArg; + com::sun::star::uno::Reference xCaller; + BOOL bValidCount; // result: - USHORT nErrCode; - BOOL bHasString; - double fValue; - String aString; - ScMatrixRef xMatrix; + USHORT nErrCode; + BOOL bHasString; + double fValue; + String aString; + ScMatrixRef xMatrix; com::sun::star::uno::Reference xVarRes; - void ExecuteCallWithArgs( + void ExecuteCallWithArgs( com::sun::star::uno::Sequence& rCallArgs); public: @@ -217,28 +217,28 @@ public: long nParamCount ); ~ScUnoAddInCall(); - BOOL NeedsCaller() const; - void SetCaller( const com::sun::star::uno::Reference< + BOOL NeedsCaller() const; + void SetCaller( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& rInterface ); - void SetCallerFromObjectShell( SfxObjectShell* pSh ); + void SetCallerFromObjectShell( SfxObjectShell* pSh ); - BOOL ValidParamCount(); - ScAddInArgumentType GetArgType( long nPos ); - void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); + BOOL ValidParamCount(); + ScAddInArgumentType GetArgType( long nPos ); + void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); - void ExecuteCall(); + void ExecuteCall(); - void SetResult( const com::sun::star::uno::Any& rNewRes ); + void SetResult( const com::sun::star::uno::Any& rNewRes ); - USHORT GetErrCode() const { return nErrCode; } - BOOL HasString() const { return bHasString; } - BOOL HasMatrix() const { return ( xMatrix.Is() ); } - BOOL HasVarRes() const { return ( xVarRes.is() ); } - double GetValue() const { return fValue; } - const String& GetString() const { return aString; } - ScMatrixRef GetMatrix() const { return xMatrix; } + USHORT GetErrCode() const { return nErrCode; } + BOOL HasString() const { return bHasString; } + BOOL HasMatrix() const { return ( xMatrix.Is() ); } + BOOL HasVarRes() const { return ( xVarRes.is() ); } + double GetValue() const { return fValue; } + const String& GetString() const { return aString; } + ScMatrixRef GetMatrix() const { return xMatrix; } com::sun::star::uno::Reference - GetVarRes() const { return xVarRes; } + GetVarRes() const { return xVarRes; } }; diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index c5d49632292e..6a8d4d79f527 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -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 @@ -25,7 +25,7 @@ * ************************************************************************/ -#ifndef SC_ADDRESS_HXX +#ifndef SC_ADDRESS_HXX #define SC_ADDRESS_HXX #include @@ -82,7 +82,7 @@ const SCSIZE SCSIZE_MAX = ::std::numeric_limits::max(); // A define to handle critical sections we hopefully don't need very often. #define SC_ROWLIMIT_MORE_THAN_32K 1 /* set to 1 if we throw the switch */ -// The maximum values. Defines are needed for preprocessor checks, for example +// The maximum values. Defines are needed for preprocessor checks, for example // in bcaslot.cxx, otherwise type safe constants are preferred. //#define MAXROWCOUNT_DEFINE 65536 #define MAXROWCOUNT_DEFINE 1048576 @@ -262,7 +262,7 @@ public: enum Uninitialized { UNINITIALIZED }; enum InitializeInvalid { INITIALIZE_INVALID }; - + struct Details { formula::FormulaGrammar::AddressConvention eConv; SCROW nRow; @@ -321,7 +321,7 @@ public: inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, + SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, const Details& rDetails = detailsOOOa1, ExternalInfo* pExtInfo = NULL, const ::com::sun::star::uno::Sequence< @@ -496,24 +496,24 @@ public: SC_DLLPUBLIC USHORT ParseRows( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); - /** Parse an Excel style reference up to and including the sheet name - separator '!', including detection of external documents and sheet - names, and in case of MOOXML import the bracketed index is used to - determine the actual document name passed in pExternalLinks. For - internal references (resulting rExternDocName empty), aStart.nTab and + /** Parse an Excel style reference up to and including the sheet name + separator '!', including detection of external documents and sheet + names, and in case of MOOXML import the bracketed index is used to + determine the actual document name passed in pExternalLinks. For + internal references (resulting rExternDocName empty), aStart.nTab and aEnd.nTab are set, or -1 if sheet name not found. - @param bOnlyAcceptSingle If , a 3D reference (Sheet1:Sheet2) + @param bOnlyAcceptSingle If , a 3D reference (Sheet1:Sheet2) encountered results in an error (NULL returned). - @param pExternalLinks pointer to ExternalLinkInfo sequence, may be - NULL for non-filter usage, in which case indices such as [1] are + @param pExternalLinks pointer to ExternalLinkInfo sequence, may be + NULL for non-filter usage, in which case indices such as [1] are not resolved. @returns - Pointer to the position after '!' if successfully parsed, and - rExternDocName, rStartTabName and/or rEndTabName filled if + Pointer to the position after '!' if successfully parsed, and + rExternDocName, rStartTabName and/or rEndTabName filled if applicable. SCA_... flags set in nFlags. - Or if no valid document and/or sheet header could be parsed the start + Or if no valid document and/or sheet header could be parsed the start position passed with pString. - Or NULL if a 3D sheet header could be parsed but + Or NULL if a 3D sheet header could be parsed but bOnlyAcceptSingle==true was given. */ const sal_Unicode* Parse_XL_Header( const sal_Unicode* pString, const ScDocument* pDoc, diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index d6df571a29aa..2cf8eca6e51a 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -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/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 9cb402a03764..a5f41642a303 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -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 @@ -51,7 +51,7 @@ class ScAutoFormatFieldObj; class ScAutoFormatObj; -#define SC_AFMTOBJ_INVALID USHRT_MAX +#define SC_AFMTOBJ_INVALID USHRT_MAX ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL @@ -67,30 +67,30 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo > { private: - ScAutoFormatObj* GetObjectByIndex_Impl(USHORT nIndex); - ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScAutoFormatObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScAutoFormatsObj(); - virtual ~ScAutoFormatsObj(); + virtual ~ScAutoFormatsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -143,20 +143,20 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper6< public SfxListener { private: - SfxItemPropertySet aPropSet; - USHORT nFormatIndex; + SfxItemPropertySet aPropSet; + USHORT nFormatIndex; - ScAutoFormatFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatFieldObj* GetObjectByIndex_Impl(USHORT nIndex); public: ScAutoFormatObj(USHORT nIndex); - virtual ~ScAutoFormatObj(); + virtual ~ScAutoFormatObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: - sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } - void InitFormat( USHORT nNewIndex ); + sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } + void InitFormat( USHORT nNewIndex ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -176,14 +176,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -195,25 +195,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -245,21 +245,21 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - SfxItemPropertySet aPropSet; - USHORT nFormatIndex; - USHORT nFieldIndex; + SfxItemPropertySet aPropSet; + USHORT nFormatIndex; + USHORT nFieldIndex; public: ScAutoFormatFieldObj(USHORT nFormat, USHORT nField); - virtual ~ScAutoFormatFieldObj(); + virtual ~ScAutoFormatFieldObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -271,25 +271,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 050611eeeb9e..8b4a88b59feb 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -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 @@ -61,20 +61,20 @@ class ScSpreadsheetSettings : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo> { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; public: ScSpreadsheetSettings(); - virtual ~ScSpreadsheetSettings(); + virtual ~ScSpreadsheetSettings(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -86,25 +86,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -127,9 +127,9 @@ class ScRecentFunctionsObj : public cppu::WeakImplHelper2< { public: ScRecentFunctionsObj(); - virtual ~ScRecentFunctionsObj(); + virtual ~ScRecentFunctionsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XRecentFunctions @@ -159,9 +159,9 @@ class ScFunctionListObj : public cppu::WeakImplHelper4< { public: ScFunctionListObj(); - virtual ~ScFunctionListObj(); + virtual ~ScFunctionListObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XFunctionDescriptions diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 91fc43fc249a..4056b3c39a01 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -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 @@ -42,86 +42,86 @@ public: ScAppOptions( const ScAppOptions& rCpy ); ~ScAppOptions(); - void SetDefaults(); + void SetDefaults(); - void SetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; } - FieldUnit GetAppMetric() const { return eMetric; } - void SetZoom( USHORT nNew ) { nZoom = nNew; } - USHORT GetZoom() const { return nZoom; } - void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } - SvxZoomType GetZoomType() const { return eZoomType; } + void SetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; } + FieldUnit GetAppMetric() const { return eMetric; } + void SetZoom( USHORT nNew ) { nZoom = nNew; } + USHORT GetZoom() const { return nZoom; } + void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } + SvxZoomType GetZoomType() const { return eZoomType; } void SetSynchronizeZoom( BOOL bNew ) { bSynchronizeZoom = bNew; } BOOL GetSynchronizeZoom() const { return bSynchronizeZoom; } - USHORT GetLRUFuncListCount() const { return nLRUFuncCount; } - USHORT* GetLRUFuncList() const { return pLRUList; } - void SetLRUFuncList( const USHORT* pList, + USHORT GetLRUFuncListCount() const { return nLRUFuncCount; } + USHORT* GetLRUFuncList() const { return pLRUList; } + void SetLRUFuncList( const USHORT* pList, const USHORT nCount ); - void SetStatusFunc( USHORT nNew ) { nStatusFunc = nNew; } - USHORT GetStatusFunc() const { return nStatusFunc; } - void SetAutoComplete( BOOL bNew ) { bAutoComplete = bNew; } - BOOL GetAutoComplete() const { return bAutoComplete; } - void SetDetectiveAuto( BOOL bNew ) { bDetectiveAuto = bNew; } - BOOL GetDetectiveAuto() const { return bDetectiveAuto; } - - void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; } - sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; } - void SetTrackInsertColor(sal_uInt32 nNew) { nTrackInsertColor = nNew; } - sal_uInt32 GetTrackInsertColor() const { return nTrackInsertColor; } - void SetTrackDeleteColor(sal_uInt32 nNew) { nTrackDeleteColor = nNew; } - sal_uInt32 GetTrackDeleteColor() const { return nTrackDeleteColor; } - void SetTrackMoveColor(sal_uInt32 nNew) { nTrackMoveColor = nNew; } - sal_uInt32 GetTrackMoveColor() const { return nTrackMoveColor; } - - ScLkUpdMode GetLinkMode() const { return eLinkMode ;} - void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} - - void SetDefaultObjectSizeWidth(INT32 nNew) { nDefaultObjectSizeWidth = nNew; } - INT32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } - void SetDefaultObjectSizeHeight(INT32 nNew) { nDefaultObjectSizeHeight = nNew; } - INT32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } + void SetStatusFunc( USHORT nNew ) { nStatusFunc = nNew; } + USHORT GetStatusFunc() const { return nStatusFunc; } + void SetAutoComplete( BOOL bNew ) { bAutoComplete = bNew; } + BOOL GetAutoComplete() const { return bAutoComplete; } + void SetDetectiveAuto( BOOL bNew ) { bDetectiveAuto = bNew; } + BOOL GetDetectiveAuto() const { return bDetectiveAuto; } + + void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; } + sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; } + void SetTrackInsertColor(sal_uInt32 nNew) { nTrackInsertColor = nNew; } + sal_uInt32 GetTrackInsertColor() const { return nTrackInsertColor; } + void SetTrackDeleteColor(sal_uInt32 nNew) { nTrackDeleteColor = nNew; } + sal_uInt32 GetTrackDeleteColor() const { return nTrackDeleteColor; } + void SetTrackMoveColor(sal_uInt32 nNew) { nTrackMoveColor = nNew; } + sal_uInt32 GetTrackMoveColor() const { return nTrackMoveColor; } + + ScLkUpdMode GetLinkMode() const { return eLinkMode ;} + void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} + + void SetDefaultObjectSizeWidth(INT32 nNew) { nDefaultObjectSizeWidth = nNew; } + INT32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } + void SetDefaultObjectSizeHeight(INT32 nNew) { nDefaultObjectSizeHeight = nNew; } + INT32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } void SetShowSharedDocumentWarning( BOOL bNew ) { mbShowSharedDocumentWarning = bNew; } BOOL GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; } - const ScAppOptions& operator= ( const ScAppOptions& rOpt ); + const ScAppOptions& operator= ( const ScAppOptions& rOpt ); private: - FieldUnit eMetric; - USHORT nLRUFuncCount; - USHORT* pLRUList; + FieldUnit eMetric; + USHORT nLRUFuncCount; + USHORT* pLRUList; SvxZoomType eZoomType; - USHORT nZoom; + USHORT nZoom; BOOL bSynchronizeZoom; - USHORT nStatusFunc; - BOOL bAutoComplete; - BOOL bDetectiveAuto; - sal_uInt32 nTrackContentColor; - sal_uInt32 nTrackInsertColor; - sal_uInt32 nTrackDeleteColor; - sal_uInt32 nTrackMoveColor; + USHORT nStatusFunc; + BOOL bAutoComplete; + BOOL bDetectiveAuto; + sal_uInt32 nTrackContentColor; + sal_uInt32 nTrackInsertColor; + sal_uInt32 nTrackDeleteColor; + sal_uInt32 nTrackMoveColor; ScLkUpdMode eLinkMode; - INT32 nDefaultObjectSizeWidth; - INT32 nDefaultObjectSizeHeight; + INT32 nDefaultObjectSizeWidth; + INT32 nDefaultObjectSizeHeight; BOOL mbShowSharedDocumentWarning; }; //================================================================== -// Config Item containing app options +// Config Item containing app options //================================================================== class ScAppCfg : public ScAppOptions { - // spread about 5 config paths - //! split ScAppOptions into different classes + // spread about 5 config paths + //! split ScAppOptions into different classes - ScLinkConfigItem aLayoutItem; - ScLinkConfigItem aInputItem; - ScLinkConfigItem aRevisionItem; - ScLinkConfigItem aContentItem; - ScLinkConfigItem aSortListItem; - ScLinkConfigItem aMiscItem; + ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aInputItem; + ScLinkConfigItem aRevisionItem; + ScLinkConfigItem aContentItem; + ScLinkConfigItem aSortListItem; + ScLinkConfigItem aMiscItem; DECL_LINK( LayoutCommitHdl, void* ); DECL_LINK( InputCommitHdl, void* ); @@ -140,8 +140,8 @@ class ScAppCfg : public ScAppOptions public: ScAppCfg(); - void SetOptions( const ScAppOptions& rNew ); - void OptionsChanged(); // after direct access to ScAppOptions base class + void SetOptions( const ScAppOptions& rNew ); + void OptionsChanged(); // after direct access to ScAppOptions base class }; diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 46ce98709df1..51b9c549ecc0 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -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 @@ -52,7 +52,7 @@ private: BOOL bInCreate; BOOL bDoInsert; // wird fuer das erste Update auf FALSE gesetzt - BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); + BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); public: TYPEINFO(); @@ -67,23 +67,23 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh( const String& rNewFile, const String& rNewFilter, + BOOL Refresh( const String& rNewFile, const String& rNewFilter, const String& rNewArea, ULONG nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetDoInsert(BOOL bSet) { bDoInsert = bSet; } - void SetDestArea(const ScRange& rNew); - void SetSource(const String& rDoc, const String& rFlt, const String& rOpt, + void SetInCreate(BOOL bSet) { bInCreate = bSet; } + void SetDoInsert(BOOL bSet) { bDoInsert = bSet; } + void SetDestArea(const ScRange& rNew); + void SetSource(const String& rDoc, const String& rFlt, const String& rOpt, const String& rArea); - BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt, + BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt, const String& rSource, const ScRange& rDest ) const; - const String& GetFile() const { return aFileName; } - const String& GetFilter() const { return aFilterName; } - const String& GetOptions() const { return aOptions; } - const String& GetSource() const { return aSourceArea; } - const ScRange& GetDestArea() const { return aDestArea; } + const String& GetFile() const { return aFileName; } + const String& GetFilter() const { return aFilterName; } + const String& GetOptions() const { return aOptions; } + const String& GetSource() const { return aSourceArea; } + const ScRange& GetDestArea() const { return aDestArea; } DECL_LINK( RefreshHdl, ScAreaLink* ); DECL_LINK( AreaEndEditHdl, void* ); diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 11b21bab0162..2ce3729cc69a 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -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 @@ -44,20 +44,20 @@ class SvxBorderLine; class SvxBoxItem; class SvxBoxInfoItem; -#define SC_LINE_EMPTY 0 -#define SC_LINE_SET 1 -#define SC_LINE_DONTCARE 2 +#define SC_LINE_EMPTY 0 +#define SC_LINE_SET 1 +#define SC_LINE_DONTCARE 2 #define SC_ATTRARRAY_DELTA 4 struct ScLineFlags { - BYTE nLeft; - BYTE nRight; - BYTE nTop; - BYTE nBottom; - BYTE nHori; - BYTE nVert; + BYTE nLeft; + BYTE nRight; + BYTE nTop; + BYTE nBottom; + BYTE nHori; + BYTE nVert; ScLineFlags() : nLeft(SC_LINE_EMPTY),nRight(SC_LINE_EMPTY),nTop(SC_LINE_EMPTY), nBottom(SC_LINE_EMPTY),nHori(SC_LINE_EMPTY),nVert(SC_LINE_EMPTY) {} @@ -74,23 +74,23 @@ struct ScMergePatternState struct ScAttrEntry { - SCROW nRow; - const ScPatternAttr* pPattern; + SCROW nRow; + const ScPatternAttr* pPattern; }; class ScAttrArray { private: - SCCOL nCol; - SCTAB nTab; - ScDocument* pDocument; + SCCOL nCol; + SCTAB nTab; + ScDocument* pDocument; - SCSIZE nCount; + SCSIZE nCount; SCSIZE nLimit; - ScAttrEntry* pData; + ScAttrEntry* pData; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScAttrIterator; friend class ScHorizontalAttrIterator; @@ -98,7 +98,7 @@ friend void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc ); - BOOL ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + BOOL ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ); @@ -106,105 +106,105 @@ public: ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); ~ScAttrArray(); - void SetTab(SCTAB nNewTab) { nTab = nNewTab; } - void SetCol(SCCOL nNewCol) { nCol = nNewCol; } + void SetTab(SCTAB nNewTab) { nTab = nNewTab; } + void SetCol(SCCOL nNewCol) { nCol = nNewCol; } #ifdef DBG_UTIL - void TestData() const; + void TestData() const; #endif - void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); - BOOL Concat(SCSIZE nPos); + void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); + BOOL Concat(SCSIZE nPos); const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const; - void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const; + void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); - void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE); - void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); - void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache ); - void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, + void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE); + void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); + void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache ); + void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, const SvxBorderLine* pLine, BOOL bColorOnly ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); - void ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); + void ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement ); /// Including current, may return -1 - SCsROW GetNextUnprotected( SCsROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCsROW nRow, BOOL bUp ) const; /// May return -1 if not found - SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, + SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, BOOL bUp, ScMarkArray* pMarkArray = NULL ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, BOOL bUp, ScMarkArray* pMarkArray = NULL ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; - BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, + BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, BOOL bLeft, BOOL bRight ) const; bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, + BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, BOOL bRefresh, BOOL bAttrs ); - BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); + BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); - void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); - void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, + void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); + void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, BOOL bDefault ); - void CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ); + void CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ); - BOOL IsEmpty() const; + BOOL IsEmpty() const; -//UNUSED2008-05 SCROW GetFirstEntryPos() const; -//UNUSED2008-05 SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; +//UNUSED2008-05 SCROW GetFirstEntryPos() const; +//UNUSED2008-05 SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleEqual( const ScAttrArray& rOther, + BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsVisibleEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; - void InsertRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ); - void DeleteArea( SCROW nStartRow, SCROW nEndRow ); - void MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ); - void CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, + BOOL IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; + + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + BOOL TestInsertRow( SCSIZE nSize ) const; + void InsertRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ); + void DeleteArea( SCROW nStartRow, SCROW nEndRow ); + void MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ); + void CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, INT16 nStripFlags = 0 ); - void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); + void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); //UNUSED2008-05 void ConvertFontsAfterLoad(); // old binary file format }; -// ------------------------------------------------------------------------------ -// Iterator fuer Attribute -// ------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ +// Iterator fuer Attribute +// ------------------------------------------------------------------------------ class ScAttrIterator { - const ScAttrArray* pArray; - SCSIZE nPos; - SCROW nRow; - SCROW nEndRow; + const ScAttrArray* pArray; + SCSIZE nPos; + SCROW nRow; + SCROW nEndRow; public: - inline ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd ); - inline const ScPatternAttr* Next( SCROW& rTop, SCROW& rBottom ); - SCROW GetNextRow() const { return nRow; } + inline ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd ); + inline const ScPatternAttr* Next( SCROW& rTop, SCROW& rBottom ); + SCROW GetNextRow() const { return nRow; } }; @@ -219,7 +219,7 @@ inline ScAttrIterator::ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStar nPos = 0; } -inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) +inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) { const ScPatternAttr* pRet; if ( nPos < pArray->nCount && nRow <= nEndRow ) diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 96a0529c48a1..c42d31bef45a 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -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 @@ -45,7 +45,7 @@ #define SC_MF_BUTTON 0x0008 /// field button for datapilot #define SC_MF_SCENARIO 0x0010 #define SC_MF_BUTTON_POPUP 0x0020 /// dp button with popup arrow -#define SC_MF_HIDDEN_MEMBER 0x0040 /// dp field button with presence of hidden member +#define SC_MF_HIDDEN_MEMBER 0x0040 /// dp field button with presence of hidden member #define SC_MF_DP_TABLE 0x0080 /// dp table output #define SC_MF_ALL 0x00FF @@ -69,7 +69,7 @@ public: ScMergeAttr( const ScMergeAttr& ); ~ScMergeAttr(); - virtual String GetValueText() const; + virtual String GetValueText() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -78,7 +78,7 @@ public: SCsCOL GetColMerge() const {return nColMerge; } SCsROW GetRowMerge() const {return nRowMerge; } - BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } + BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } inline ScMergeAttr& operator=(const ScMergeAttr& rMerge) { @@ -97,15 +97,15 @@ public: ScMergeFlagAttr(INT16 nFlags); ~ScMergeFlagAttr(); - BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } - BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } - BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } + BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } + BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } + BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } - BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } - BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } + BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } + BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } bool HasDPTable() const { return ( GetValue() & SC_MF_DP_TABLE ) != 0; } - BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } + BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } }; //------------------------------------------------------------------------ @@ -125,7 +125,7 @@ public: ScProtectionAttr( const ScProtectionAttr& ); ~ScProtectionAttr(); - virtual String GetValueText() const; + virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -137,8 +137,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); BOOL GetProtection() const { return bProtection; } BOOL SetProtection( BOOL bProtect); @@ -162,41 +162,41 @@ public: //---------------------------------------------------------------------------- // ScRangeItem: verwaltet einen Tabellenbereich -#define SCR_INVALID 0x01 -#define SCR_ALLTABS 0x02 -#define SCR_TONEWTAB 0x04 +#define SCR_INVALID 0x01 +#define SCR_ALLTABS 0x02 +#define SCR_TONEWTAB 0x04 class ScRangeItem : public SfxPoolItem { public: TYPEINFO(); - inline ScRangeItem( const USHORT nWhich ); - inline ScRangeItem( const USHORT nWhich, + inline ScRangeItem( const USHORT nWhich ); + inline ScRangeItem( const USHORT nWhich, const ScRange& rRange, - const USHORT nNewFlags = 0 ); - inline ScRangeItem( const ScRangeItem& rCpy ); + const USHORT nNewFlags = 0 ); + inline ScRangeItem( const ScRangeItem& rCpy ); inline ScRangeItem& operator=( const ScRangeItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScRange& GetRange() const { return aRange; } - void SetRange( const ScRange& rNew ) { aRange = rNew; } + const ScRange& GetRange() const { return aRange; } + void SetRange( const ScRange& rNew ) { aRange = rNew; } - USHORT GetFlags() const { return nFlags; } - void SetFlags( USHORT nNew ) { nFlags = nNew; } + USHORT GetFlags() const { return nFlags; } + void SetFlags( USHORT nNew ) { nFlags = nNew; } private: ScRange aRange; - USHORT nFlags; + USHORT nFlags; }; inline ScRangeItem::ScRangeItem( const USHORT nWhichP ) @@ -206,7 +206,7 @@ inline ScRangeItem::ScRangeItem( const USHORT nWhichP ) inline ScRangeItem::ScRangeItem( const USHORT nWhichP, const ScRange& rRange, - const USHORT nNew ) + const USHORT nNew ) : SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew ) { } @@ -229,7 +229,7 @@ class ScTableListItem : public SfxPoolItem public: TYPEINFO(); - inline ScTableListItem( const USHORT nWhich ); + inline ScTableListItem( const USHORT nWhich ); ScTableListItem( const ScTableListItem& rCpy ); //UNUSED2008-05 ScTableListItem( const USHORT nWhich, const List& rList ); ~ScTableListItem(); @@ -237,16 +237,16 @@ public: ScTableListItem& operator=( const ScTableListItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; -//UNUSED2009-05 BOOL GetTableList( List& aList ) const; -//UNUSED2009-05 void SetTableList( const List& aList ); +//UNUSED2009-05 BOOL GetTableList( List& aList ) const; +//UNUSED2009-05 void SetTableList( const List& aList ); public: USHORT nCount; @@ -282,12 +282,12 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - const EditTextObject* GetLeftArea() const { return pLeftArea; } - const EditTextObject* GetCenterArea() const { return pCenterArea; } - const EditTextObject* GetRightArea() const { return pRightArea; } + const EditTextObject* GetLeftArea() const { return pLeftArea; } + const EditTextObject* GetCenterArea() const { return pCenterArea; } + const EditTextObject* GetRightArea() const { return pRightArea; } void SetLeftArea( const EditTextObject& rNew ); void SetCenterArea( const EditTextObject& rNew ); @@ -310,11 +310,11 @@ public: ScViewObjectModeItem( USHORT nWhich, ScVObjMode eMode ); ~ScViewObjectModeItem(); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual USHORT GetValueCount() const; + virtual String GetValueText( USHORT nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -339,12 +339,12 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - double GetValue() const { return nValue; } + double GetValue() const { return nValue; } void SetValue( const double nVal ) { nValue = nVal;} private: - double nValue; + double nValue; }; diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 094f618fbc7c..1fce4cbe300d 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -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/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx index 0eb1b51efe29..92aff4466bc9 100644 --- a/sc/inc/autonamecache.hxx +++ b/sc/inc/autonamecache.hxx @@ -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 @@ -40,7 +40,7 @@ typedef ::std::hash_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::e // Cache for faster lookup of automatic names during CompileXML // (during CompileXML, no document content is changed) // - + class ScAutoNameCache { ScAutoNameHashMap aNames; diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index d5a066d522cc..d45840723b48 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -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 @@ -39,9 +39,9 @@ static const INT32 nInt32Max = 0x7fffffff; class ScBigAddress { - INT32 nRow; - INT32 nCol; - INT32 nTab; + INT32 nRow; + INT32 nCol; + INT32 nTab; public: ScBigAddress() : nRow(0), nCol(0), nTab(0) {} @@ -52,33 +52,33 @@ public: ScBigAddress( const ScAddress& r ) : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {} - INT32 Col() const { return nCol; } - INT32 Row() const { return nRow; } - INT32 Tab() const { return nTab; } + INT32 Col() const { return nCol; } + INT32 Row() const { return nRow; } + INT32 Tab() const { return nTab; } - void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) + void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) { nCol = nColP; nRow = nRowP; nTab = nTabP; } - void SetCol( INT32 nColP ) { nCol = nColP; } - void SetRow( INT32 nRowP ) { nRow = nRowP; } - void SetTab( INT32 nTabP ) { nTab = nTabP; } - void IncCol( INT32 n = 1 ) { nCol += n; } - void IncRow( INT32 n = 1 ) { nRow += n; } - void IncTab( INT32 n = 1 ) { nTab += n; } - - void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const + void SetCol( INT32 nColP ) { nCol = nColP; } + void SetRow( INT32 nRowP ) { nRow = nRowP; } + void SetTab( INT32 nTabP ) { nTab = nTabP; } + void IncCol( INT32 n = 1 ) { nCol += n; } + void IncRow( INT32 n = 1 ) { nRow += n; } + void IncTab( INT32 n = 1 ) { nTab += n; } + + void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - inline void PutInOrder( ScBigAddress& r ); - inline BOOL IsValid( const ScDocument* ) const; - inline ScAddress MakeAddress() const; + inline void PutInOrder( ScBigAddress& r ); + inline BOOL IsValid( const ScDocument* ) const; + inline ScAddress MakeAddress() const; - ScBigAddress& operator=( const ScBigAddress& r ) + ScBigAddress& operator=( const ScBigAddress& r ) { nCol = r.nCol; nRow = r.nRow; nTab = r.nTab; return *this; } - ScBigAddress& operator=( const ScAddress& r ) + ScBigAddress& operator=( const ScAddress& r ) { nCol = r.Col(); nRow = r.Row(); nTab = r.Tab(); return *this; } - int operator==( const ScBigAddress& r ) const + int operator==( const ScBigAddress& r ) const { return nCol == r.nCol && nRow == r.nRow && nTab == r.nTab; } - int operator!=( const ScBigAddress& r ) const + int operator!=( const ScBigAddress& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr ); @@ -111,7 +111,7 @@ inline void ScBigAddress::PutInOrder( ScBigAddress& r ) inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const -{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab +{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab return ((0 <= nCol && nCol <= MAXCOL) || nCol == nInt32Min || nCol == nInt32Max) && @@ -172,8 +172,8 @@ class ScBigRange { public: - ScBigAddress aStart; - ScBigAddress aEnd; + ScBigAddress aStart; + ScBigAddress aEnd; ScBigRange() : aStart(), aEnd() {} ScBigRange( const ScBigAddress& s, const ScBigAddress& e ) @@ -193,31 +193,31 @@ public: : aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 ) {} - void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, + void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, INT32 nCol2, INT32 nRow2, INT32 nTab2 ) { aStart.Set( nCol1, nRow1, nTab1 ); aEnd.Set( nCol2, nRow2, nTab2 ); } - void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, + void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, INT32& nCol2, INT32& nRow2, INT32& nTab2 ) const { aStart.GetVars( nCol1, nRow1, nTab1 ); aEnd.GetVars( nCol2, nRow2, nTab2 ); } - BOOL IsValid( const ScDocument* pDoc ) const + BOOL IsValid( const ScDocument* pDoc ) const { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); } - inline ScRange MakeRange() const + inline ScRange MakeRange() const { return ScRange( aStart.MakeAddress(), aEnd.MakeAddress() ); } - inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? - inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? - inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? + inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? + inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? + inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? - ScBigRange& operator=( const ScBigRange& r ) + ScBigRange& operator=( const ScBigRange& r ) { aStart = r.aStart; aEnd = r.aEnd; return *this; } - int operator==( const ScBigRange& r ) const + int operator==( const ScBigRange& r ) const { return (aStart == r.aStart) && (aEnd == r.aEnd); } - int operator!=( const ScBigRange& r ) const + int operator!=( const ScBigRange& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange ); diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index cdba4e3a78bb..4c49f52b71a1 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -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 @@ -34,24 +34,24 @@ #include class ScBaseCell; -#define SC_HINT_DYING SFX_HINT_DYING -#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED -#define SC_HINT_TABLEOPDIRTY SFX_HINT_USER00 +#define SC_HINT_DYING SFX_HINT_DYING +#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED +#define SC_HINT_TABLEOPDIRTY SFX_HINT_USER00 #define SC_HINT_CALCALL SFX_HINT_USER01 class ScHint : public SfxSimpleHint { private: - ScAddress aAddress; + ScAddress aAddress; ScBaseCell* pCell; public: TYPEINFO(); ScHint( ULONG n, const ScAddress& a, ScBaseCell* p ) : SfxSimpleHint( n ), aAddress( a ), pCell( p ) {} - ScBaseCell* GetCell() const { return pCell; } + ScBaseCell* GetCell() const { return pCell; } void SetCell( ScBaseCell* p ) { pCell = p; } - const ScAddress& GetAddress() const { return aAddress; } + const ScAddress& GetAddress() const { return aAddress; } ScAddress& GetAddress() { return aAddress; } void SetAddress( const ScAddress& rAdr ) { aAddress = rAdr; } }; @@ -59,11 +59,11 @@ public: class ScAreaChangedHint : public SfxHint { private: - ScRange aNewRange; + ScRange aNewRange; public: TYPEINFO(); ScAreaChangedHint(const ScRange& rRange) : aNewRange(rRange) {} - const ScRange& GetRange() const { return aNewRange; } + const ScRange& GetRange() const { return aNewRange; } }; diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 58962ea18c03..995c2bebbf75 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -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 @@ -31,20 +31,20 @@ #include "collect.hxx" //------------------------------------------------------------------------ -#define MAXFUNCPARAM 16 -#define MAXARRSIZE 0xfffe +#define MAXFUNCPARAM 16 +#define MAXARRSIZE 0xfffe //------------------------------------------------------------------------ #ifndef WIN #ifndef WNT #define CALLTYPE #else -#define CALLTYPE __cdecl +#define CALLTYPE __cdecl #endif #else -#define PASCAL _pascal -#define FAR _far -#define CALLTYPE FAR PASCAL +#define PASCAL _pascal +#define FAR _far +#define CALLTYPE FAR PASCAL #endif extern "C" { @@ -68,12 +68,12 @@ class FuncData : public ScDataObject { friend class FuncCollection; const ModuleData* pModuleData; - String aInternalName; - String aFuncName; + String aInternalName; + String aFuncName; USHORT nNumber; - USHORT nParamCount; - ParamType eAsyncType; - ParamType eParamType[MAXFUNCPARAM]; + USHORT nParamCount; + ParamType eAsyncType; + ParamType eParamType[MAXFUNCPARAM]; private: FuncData(const String& rIName); public: @@ -85,22 +85,22 @@ public: const ParamType* peType, ParamType eType); FuncData(const FuncData& rData); - virtual ScDataObject* Clone() const { return new FuncData(*this); } + virtual ScDataObject* Clone() const { return new FuncData(*this); } - const String& GetModuleName() const; - const String& GetInternalName() const { return aInternalName; } - const String& GetFuncName() const { return aFuncName; } - USHORT GetParamCount() const { return nParamCount; } - ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } - ParamType GetReturnType() const { return eParamType[0]; } - ParamType GetAsyncType() const { return eAsyncType; } + const String& GetModuleName() const; + const String& GetInternalName() const { return aInternalName; } + const String& GetFuncName() const { return aFuncName; } + USHORT GetParamCount() const { return nParamCount; } + ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } + ParamType GetReturnType() const { return eParamType[0]; } + ParamType GetAsyncType() const { return eAsyncType; } BOOL Call(void** ppParam); - BOOL Unadvice(double nHandle); + BOOL Unadvice(double nHandle); // Name und Beschreibung des Parameters nParam. // nParam==0 => Desc := Funktions-Beschreibung, // Name := n/a - BOOL GetParamDesc( String& aName, String& aDesc, USHORT nParam ); + BOOL GetParamDesc( String& aName, String& aDesc, USHORT nParam ); }; @@ -111,10 +111,10 @@ public: FuncCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {} FuncCollection(const FuncCollection& rFuncCollection) : ScSortedCollection ( rFuncCollection ) {} - virtual ScDataObject* Clone() const { return new FuncCollection(*this); } - FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; + virtual ScDataObject* Clone() const { return new FuncCollection(*this); } + FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; }; diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index ad9ed02a0415..ac9e84bc8aa9 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -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 @@ -43,11 +43,11 @@ #include "scdllapi.h" #define USE_MEMPOOL -#define TEXTWIDTH_DIRTY 0xffff +#define TEXTWIDTH_DIRTY 0xffff // in addition to SCRIPTTYPE_... flags from scripttypeitem.hxx: // set (in nScriptType) if type has not been determined yet -#define SC_SCRIPTTYPE_UNKNOWN 0x08 +#define SC_SCRIPTTYPE_UNKNOWN 0x08 class ScDocument; class EditTextObject; @@ -79,7 +79,7 @@ const int SC_CLONECELL_NOCAPTION = 0x0004; class SC_DLLPUBLIC ScBaseCell { protected: - ~ScBaseCell(); // nicht virtuell -> darf nicht direkt aufgerufen werden + ~ScBaseCell(); // nicht virtuell -> darf nicht direkt aufgerufen werden public: explicit ScBaseCell( CellType eNewType ); @@ -103,7 +103,7 @@ public: deletes the cell by calling the appropriate d'tor of the derived class. */ void Delete(); - inline CellType GetCellType() const { return (CellType)eCellType; } + inline CellType GetCellType() const { return (CellType)eCellType; } /** Returns true, if the cell is empty (neither value nor formula nor cell note). Returns false for formula cells returning nothing, use HasEmptyData() for that. */ @@ -144,8 +144,8 @@ public: static ScBaseCell* CreateTextCell( const String& rString, ScDocument* ); // nOnlyNames may be one or more of SC_LISTENING_NAMES_* - void StartListeningTo( ScDocument* pDoc ); - void EndListeningTo( ScDocument* pDoc, + void StartListeningTo( ScDocument* pDoc ); + void EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr = NULL, ScAddress aPos = ScAddress() ); @@ -153,12 +153,12 @@ public: USHORT GetErrorCode() const; /** ScFormulaCell with formula::svEmptyCell result, or ScNoteCell (may have been created due to reference to empty cell). */ - BOOL HasEmptyData() const; - BOOL HasValueData() const; - BOOL HasStringData() const; - String GetStringData() const; // nur echte Strings + BOOL HasEmptyData() const; + BOOL HasValueData() const; + BOOL HasStringData() const; + String GetStringData() const; // nur echte Strings - static BOOL CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); + static BOOL CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); private: ScBaseCell& operator=( const ScBaseCell& ); @@ -204,7 +204,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScValueCell ) #endif ScValueCell(); - explicit ScValueCell( double fValue ); + explicit ScValueCell( double fValue ); #ifdef DBG_UTIL ~ScValueCell(); @@ -214,7 +214,7 @@ public: inline double GetValue() const { return mfValue; } private: - double mfValue; + double mfValue; }; // ============================================================================ @@ -227,18 +227,18 @@ public: #endif ScStringCell(); - explicit ScStringCell( const String& rString ); + explicit ScStringCell( const String& rString ); #ifdef DBG_UTIL ~ScStringCell(); #endif - inline void SetString( const String& rString ) { maString = rString; } - inline void GetString( String& rString ) const { rString = maString; } + inline void SetString( const String& rString ) { maString = rString; } + inline void GetString( String& rString ) const { rString = maString; } inline const String& GetString() const { return maString; } private: - String maString; + String maString; }; // ============================================================================ @@ -246,11 +246,11 @@ private: class SC_DLLPUBLIC ScEditCell : public ScBaseCell { private: - EditTextObject* pData; - String* pString; // fuer schnelleren Zugriff von Formeln - ScDocument* pDoc; // fuer EditEngine Zugriff mit Pool + EditTextObject* pData; + String* pString; // fuer schnelleren Zugriff von Formeln + ScDocument* pDoc; // fuer EditEngine Zugriff mit Pool - void SetTextObject( const EditTextObject* pObject, + void SetTextObject( const EditTextObject* pObject, const SfxItemPool* pFromPool ); // not implemented @@ -262,7 +262,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScEditCell ) #endif - ~ScEditCell(); // wegen pData immer! + ~ScEditCell(); // wegen pData immer! ScEditCell( const EditTextObject* pObject, ScDocument*, const SfxItemPool* pFromPool /* = NULL */ ); @@ -270,12 +270,12 @@ public: // fuer Zeilenumbrueche ScEditCell( const String& rString, ScDocument* ); - void SetData( const EditTextObject* pObject, + void SetData( const EditTextObject* pObject, const SfxItemPool* pFromPool /* = NULL */ ); - void GetData( const EditTextObject*& rpObject ) const; - void GetString( String& rString ) const; + void GetData( const EditTextObject*& rpObject ) const; + void GetString( String& rString ) const; - const EditTextObject* GetData() const { return pData; } + const EditTextObject* GetData() const { return pData; } }; // ============================================================================ @@ -318,7 +318,7 @@ private: SCITP_FROM_ITERATION, SCITP_CLOSE_ITERATION_CIRCLE }; - void InterpretTail( ScInterpretTailParameter ); + void InterpretTail( ScInterpretTailParameter ); ScFormulaCell( const ScFormulaCell& ); @@ -328,7 +328,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell ) #endif - ScAddress aPos; + ScAddress aPos; ~ScFormulaCell(); ScFormulaCell(); @@ -349,33 +349,33 @@ public: ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const ScAddress& rPos, int nCloneFlags = SC_CLONECELL_DEFAULT ); - void GetFormula( String& rFormula, + void GetFormula( String& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void GetFormula( rtl::OUStringBuffer& rBuffer, + void GetFormula( rtl::OUStringBuffer& rBuffer, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void SetDirty(); - inline void SetDirtyVar() { bDirty = TRUE; } + void SetDirty(); + inline void SetDirtyVar() { bDirty = TRUE; } // If setting entire document dirty after load, no broadcasts but still append to FormulaTree. void SetDirtyAfterLoad(); - inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } - void SetTableOpDirty(); - BOOL IsDirtyOrInTableOpDirty() const; - BOOL GetDirty() const { return bDirty; } + inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } + void SetTableOpDirty(); + BOOL IsDirtyOrInTableOpDirty() const; + BOOL GetDirty() const { return bDirty; } BOOL NeedsListening() const { return bNeedListening; } void SetNeedsListening( BOOL bVar ) { bNeedListening = bVar; } - void Compile(const String& rFormula, + void Compile(const String& rFormula, BOOL bNoListening = FALSE, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); - void CompileTokenArray( BOOL bNoListening = FALSE ); - void CompileXML( ScProgress& rProgress ); // compile temporary string tokens - void CalcAfterLoad(); + void CompileTokenArray( BOOL bNoListening = FALSE ); + void CompileXML( ScProgress& rProgress ); // compile temporary string tokens + void CalcAfterLoad(); bool MarkUsedExternalReferences(); - void Interpret(); + void Interpret(); inline BOOL IsIterCell() const { return bIsIterCell; } inline USHORT GetSeenInIteration() const { return nSeenInIteration; } - BOOL HasOneReference( ScRange& r ) const; + BOOL HasOneReference( ScRange& r ) const; /* Checks if the formula contains reference list that can be expressed by one reference (like A1;A2;A3:A5 -> A1:A5). The reference list is not required to be sorted (i.e. A3;A1;A2 is @@ -385,88 +385,88 @@ public: It is similar to HasOneReference(), but more general. */ bool HasRefListExpressibleAsOneReference(ScRange& rRange) const; - BOOL HasRelNameReference() const; - BOOL HasColRowName() const; + BOOL HasRelNameReference() const; + BOOL HasColRowName() const; - void UpdateReference(UpdateRefMode eUpdateRefMode, + void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, const ScAddress* pUndoCellPos = NULL ); - void TransposeReference(); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void TransposeReference(); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void UpdateInsertTab(SCTAB nTable); - void UpdateInsertTabAbs(SCTAB nTable); - BOOL UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateRenameTab(SCTAB nTable, const String& rName); - BOOL TestTabRefAbs(SCTAB nTable); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - BOOL IsRangeNameInUse(USHORT nIndex) const; + void UpdateInsertTab(SCTAB nTable); + void UpdateInsertTabAbs(SCTAB nTable); + BOOL UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); + void UpdateRenameTab(SCTAB nTable, const String& rName); + BOOL TestTabRefAbs(SCTAB nTable); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + BOOL IsRangeNameInUse(USHORT nIndex) const; void FindRangeNamesInUse(std::set& rIndexes) const; - void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); - BOOL IsSubTotal() const { return bSubTotal; } - BOOL IsChanged() const { return bChanged; } - void ResetChanged() { bChanged = FALSE; } - BOOL IsEmpty(); // formula::svEmptyCell result + void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); + BOOL IsSubTotal() const { return bSubTotal; } + BOOL IsChanged() const { return bChanged; } + void ResetChanged() { bChanged = FALSE; } + BOOL IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result - BOOL IsEmptyDisplayedAsString(); - BOOL IsValue(); // also TRUE if formula::svEmptyCell - double GetValue(); - double GetValueAlways(); // ignore errors - void GetString( String& rString ); + BOOL IsEmptyDisplayedAsString(); + BOOL IsValue(); // also TRUE if formula::svEmptyCell + double GetValue(); + double GetValueAlways(); // ignore errors + void GetString( String& rString ); const ScMatrix* GetMatrix(); - BOOL GetMatrixOrigin( ScAddress& rPos ) const; - void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); - USHORT GetMatrixEdge( ScAddress& rOrgPos ); - USHORT GetErrCode(); // interpret first if necessary - USHORT GetRawError(); // don't interpret, just return code or result error - short GetFormatType() const { return nFormatType; } - ULONG GetFormatIndex() const { return nFormatIndex; } - void GetFormatInfo( short& nType, ULONG& nIndex ) const + BOOL GetMatrixOrigin( ScAddress& rPos ) const; + void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); + USHORT GetMatrixEdge( ScAddress& rOrgPos ); + USHORT GetErrCode(); // interpret first if necessary + USHORT GetRawError(); // don't interpret, just return code or result error + short GetFormatType() const { return nFormatType; } + ULONG GetFormatIndex() const { return nFormatIndex; } + void GetFormatInfo( short& nType, ULONG& nIndex ) const { nType = nFormatType; nIndex = nFormatIndex; } - BYTE GetMatrixFlag() const { return cMatrixFlag; } + BYTE GetMatrixFlag() const { return cMatrixFlag; } ScTokenArray* GetCode() const { return pCode; } - BOOL IsRunning() const { return bRunning; } - void SetRunning( BOOL bVal ) { bRunning = bVal; } - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); - ScFormulaCell* GetPrevious() const { return pPrevious; } - ScFormulaCell* GetNext() const { return pNext; } - void SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } - void SetNext( ScFormulaCell* pF ) { pNext = pF; } - ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } - ScFormulaCell* GetNextTrack() const { return pNextTrack; } - void SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } - void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } + BOOL IsRunning() const { return bRunning; } + void SetRunning( BOOL bVal ) { bRunning = bVal; } + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); + ScFormulaCell* GetPrevious() const { return pPrevious; } + ScFormulaCell* GetNext() const { return pNext; } + void SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } + void SetNext( ScFormulaCell* pF ) { pNext = pF; } + ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } + ScFormulaCell* GetNextTrack() const { return pNextTrack; } + void SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } + void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint); - void SetCompile( BOOL bVal ) { bCompile = bVal; } - ScDocument* GetDocument() const { return pDocument; } - void SetMatColsRows( SCCOL nCols, SCROW nRows ); - void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; + void SetCompile( BOOL bVal ) { bCompile = bVal; } + ScDocument* GetDocument() const { return pDocument; } + void SetMatColsRows( SCCOL nCols, SCROW nRows ); + void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; // ob Zelle im ChangeTrack und nicht im echten Dokument ist - void SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; } - BOOL IsInChangeTrack() const { return bInChangeTrack; } + void SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; } + BOOL IsInChangeTrack() const { return bInChangeTrack; } // Zu Typ und Format das entsprechende Standardformat. // Bei Format "Standard" evtl. das in die Formelzelle // uebernommene Format. - ULONG GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const; + ULONG GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const; // For import filters! - void AddRecalcMode( formula::ScRecalcMode ); + void AddRecalcMode( formula::ScRecalcMode ); /** For import only: set a double result. */ - void SetHybridDouble( double n ) { aResult.SetHybridDouble( n); } + void SetHybridDouble( double n ) { aResult.SetHybridDouble( n); } /** For import only: set a string result. If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first @@ -480,16 +480,16 @@ public: void SetHybridFormula( const String& r, const formula::FormulaGrammar::Grammar eGrammar ) { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; } - void SetErrCode( USHORT n ); - inline BOOL IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } - EditTextObject* CreateURLObject() ; + void SetErrCode( USHORT n ); + inline BOOL IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } + EditTextObject* CreateURLObject() ; void GetURLResult( String& rURL, String& rCellText ); /** Determines whether or not the result string contains more than one paragraph */ bool IsMultilineResult(); }; -// Iterator fuer Referenzen in einer Formelzelle +// Iterator fuer Referenzen in einer Formelzelle class ScDetectiveRefIter { private: @@ -497,7 +497,7 @@ private: ScAddress aPos; public: ScDetectiveRefIter( ScFormulaCell* pCell ); - BOOL GetNextRef( ScRange& rRange ); + BOOL GetNextRef( ScRange& rRange ); }; // ============================================================================ diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index b0b445a5993d..00da1e91f14e 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -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 @@ -38,9 +38,9 @@ class SvNumberFormatter; class Color; enum ScForceTextFmt { - ftDontForce, // Zahlen als Zahlen - ftForce, // Zahlen als Text - ftCheck // ist das Zahlenformat ein Textformat? + ftDontForce, // Zahlen als Zahlen + ftForce, // Zahlen als Text + ftCheck // ist das Zahlenformat ein Textformat? }; //------------------------------------------------------------------------ @@ -48,13 +48,13 @@ enum ScForceTextFmt { class SC_DLLPUBLIC ScCellFormat { public: - static void GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, Color** ppColor, SvNumberFormatter& rFormatter, BOOL bNullVals = TRUE, BOOL bFormula = FALSE, ScForceTextFmt eForceTextFmt = ftDontForce ); - static void GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString, SvNumberFormatter& rFormatter ); }; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index a53f167b164a..73615c5cc870 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -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 @@ -28,8 +28,8 @@ #ifndef SC_CELLSUNO_HXX #define SC_CELLSUNO_HXX -#include "global.hxx" // ScRange, ScAddress -#include "rangelst.hxx" // ScRangeList +#include "global.hxx" // ScRange, ScAddress +#include "rangelst.hxx" // ScRangeList #include "formula/grammar.hxx" #include @@ -114,11 +114,11 @@ class SvxItemPropertySet; class ScLinkListener : public SvtListener { - Link aLink; + Link aLink; public: ScLinkListener(const Link& rL) : aLink(rL) {} - virtual ~ScLinkListener(); - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); + virtual ~ScLinkListener(); + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); }; typedef ::com::sun::star::uno::Reference< @@ -130,10 +130,10 @@ typedef ScNamedEntry* ScNamedEntryPtr; SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 ) -// ScCellRangesBase - Basisklasse fuer ScCellRangesObj (mit Index-Access) -// und ScCellRangeObj (ohne Index-Access) +// ScCellRangesBase - Basisklasse fuer ScCellRangesObj (mit Index-Access) +// und ScCellRangeObj (ohne Index-Access) -// XServiceInfo ist in den Ableitungen implementiert +// XServiceInfo ist in den Ableitungen implementiert class ScHelperFunctions { @@ -173,41 +173,41 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet public cppu::OWeakObject, public SfxListener { - friend class ScTabViewObj; // fuer select() - friend class ScTableSheetObj; // fuer createCursorByRange() + friend class ScTabViewObj; // fuer select() + friend class ScTableSheetObj; // fuer createCursorByRange() friend class ooo::vba::excel::ScVbaCellRangeAccess; private: const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - ScLinkListener* pValueListener; - ScPatternAttr* pCurrentFlat; - ScPatternAttr* pCurrentDeep; - SfxItemSet* pCurrentDataSet; - SfxItemSet* pNoDfltCurrentDataSet; - ScMarkData* pMarkData; - ScRangeList aRanges; + ScDocShell* pDocShell; + ScLinkListener* pValueListener; + ScPatternAttr* pCurrentFlat; + ScPatternAttr* pCurrentDeep; + SfxItemSet* pCurrentDataSet; + SfxItemSet* pNoDfltCurrentDataSet; + ScMarkData* pMarkData; + ScRangeList aRanges; sal_Int64 nObjectId; - BOOL bChartColAsHdr; - BOOL bChartRowAsHdr; - BOOL bCursorOnly; - BOOL bGotDataChangedHint; + BOOL bChartColAsHdr; + BOOL bChartRowAsHdr; + BOOL bCursorOnly; + BOOL bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; DECL_LINK( ValueListenerHdl, SfxHint* ); private: - void PaintRanges_Impl( USHORT nPart ); - ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const; - void ForceChartListener_Impl(); + void PaintRanges_Impl( USHORT nPart ); + ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const; + void ForceChartListener_Impl(); ScMemChart* CreateMemChart_Impl() const; - const ScPatternAttr* GetCurrentAttrsFlat(); - const ScPatternAttr* GetCurrentAttrsDeep(); - SfxItemSet* GetCurrentDataSet(bool bNoDflt = false); - const ScMarkData* GetMarkData(); + const ScPatternAttr* GetCurrentAttrsFlat(); + const ScPatternAttr* GetCurrentAttrsDeep(); + SfxItemSet* GetCurrentDataSet(bool bNoDflt = false); + const ScMarkData* GetMarkData(); void ForgetMarkData(); - void ForgetCurrentAttrs(); + void ForgetCurrentAttrs(); com::sun::star::uno::Reference QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare, @@ -231,47 +231,47 @@ protected: ::com::sun::star::uno::RuntimeException); public: - ScCellRangesBase(); // fuer SMART_REFLECTION Krempel + ScCellRangesBase(); // fuer SMART_REFLECTION Krempel ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR); ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellRangesBase(); + virtual ~ScCellRangesBase(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void RefChanged(); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void RefChanged(); // aus Ableitungen, aber auch per getImplementation - ScDocShell* GetDocShell() const { return pDocShell; } - ScDocument* GetDocument() const; - const ScRangeList& GetRangeList() const { return aRanges; } - void AddRange(const ScRange& rRange, const sal_Bool bMergeRanges); + ScDocShell* GetDocShell() const { return pDocShell; } + ScDocument* GetDocument() const; + const ScRangeList& GetRangeList() const { return aRanges; } + void AddRange(const ScRange& rRange, const sal_Bool bMergeRanges); // per Service erzeugtes Objekt zum Leben erwecken: - void InitInsertRange(ScDocShell* pDocSh, const ScRange& rR); + void InitInsertRange(ScDocShell* pDocSh, const ScRange& rR); - void SetNewRange(const ScRange& rNew); // fuer Cursor - void SetNewRanges(const ScRangeList& rNew); + void SetNewRange(const ScRange& rNew); // fuer Cursor + void SetNewRanges(const ScRangeList& rNew); - void SetCursorOnly(BOOL bSet); - BOOL IsCursorOnly() const { return bCursorOnly; } + void SetCursorOnly(BOOL bSet); + BOOL IsCursorOnly() const { return bCursorOnly; } // XSheetOperation - virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) + virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) + virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -283,25 +283,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -309,7 +309,7 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, @@ -349,7 +349,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -359,25 +359,25 @@ public: ::com::sun::star::uno::RuntimeException); // XIndent - virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException); // XChartData - virtual void SAL_CALL addChartDataChangeEventListener( + virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException); + virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException); // XChartDataArray virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() @@ -387,7 +387,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); @@ -450,10 +450,10 @@ public: throw(::com::sun::star::uno::RuntimeException); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -488,21 +488,21 @@ class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, public com::sun::star::container::XEnumerationAccess { private: - ScNamedEntryArr_Impl aNamedEntries; + ScNamedEntryArr_Impl aNamedEntries; ScCellRangeObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellRangesObj(); + virtual ~ScCellRangesObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); // XSheetCellRanges virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL @@ -513,35 +513,35 @@ public: getRangeAddresses() throw(::com::sun::star::uno::RuntimeException); // XSheetCellRangeContainer - virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, + virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) + virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -610,11 +610,11 @@ class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, public com::sun::star::table::XColumnRowRange { private: - const SfxItemPropertySet* pRangePropSet; - ScRange aRange; + const SfxItemPropertySet* pRangePropSet; + ScRange aRange; protected: - const ScRange& GetRange() const { return aRange; } + const ScRange& GetRange() const { return aRange; } virtual const SfxItemPropertyMap* GetItemPropertyMap(); virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) @@ -636,7 +636,7 @@ protected: public: ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellRangeObj(); + virtual ~ScCellRangeObj(); // uses ObjectShell from document, if set (returns NULL otherwise) static com::sun::star::uno::Reference @@ -645,10 +645,10 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); // via getImplementation() virtual void SetArrayFormulaWithGrammar( const ::rtl::OUString& rFormula, @@ -657,7 +657,7 @@ public: throw(::com::sun::star::uno::RuntimeException); // XCellRange ist Basisklasse von XSheetCellRange und XSheetOperation -// operator XCellRangeRef() const { return (XSheetCellRange*)this; } +// operator XCellRangeRef() const { return (XSheetCellRange*)this; } // XCellRangeAddressable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() @@ -669,7 +669,7 @@ public: // XArrayFormulaRange virtual ::rtl::OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArrayFormula( const ::rtl::OUString& aFormula ) + virtual void SAL_CALL setArrayFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); // XArrayFormulaTokens @@ -683,7 +683,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw(::com::sun::star::uno::RuntimeException); @@ -692,12 +692,12 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getFormulaArray() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aArray ) throw (::com::sun::star::uno::RuntimeException); // XMultipleOperation - virtual void SAL_CALL setTableOperation( + virtual void SAL_CALL setTableOperation( const ::com::sun::star::table::CellRangeAddress& aFormulaRange, ::com::sun::star::sheet::TableOperationMode nMode, const ::com::sun::star::table::CellAddress& aColumnCell, @@ -705,28 +705,28 @@ public: throw(::com::sun::star::uno::RuntimeException); // XMergeable - virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsMerged() throw(::com::sun::star::uno::RuntimeException); // XCellSeries - virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, + virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, ::com::sun::star::sheet::FillMode nFillMode, ::com::sun::star::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, + virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, sal_Int32 nSourceCount ) throw(::com::sun::star::uno::RuntimeException); // XAutoFormattable - virtual void SAL_CALL autoFormat( const ::rtl::OUString& aName ) + virtual void SAL_CALL autoFormat( const ::rtl::OUString& aName ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XSortable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -740,7 +740,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -748,16 +748,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL createSubTotalDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL applySubTotals( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL applySubTotals( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor >& xDescriptor, sal_Bool bReplace ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException); // XImportable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createImportDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -813,7 +813,7 @@ public: }; -//! really derive cell from range? +//! really derive cell from range? class ScCellObj : public ScCellRangeObj, public com::sun::star::text::XText, @@ -826,17 +826,17 @@ class ScCellObj : public ScCellRangeObj, public com::sun::star::document::XActionLockable { private: - SvxUnoText* pUnoText; - const SfxItemPropertySet* pCellPropSet; - ScAddress aCellPos; - sal_Int16 nActionLockCount; + SvxUnoText* pUnoText; + const SfxItemPropertySet* pCellPropSet; + ScAddress aCellPos; + sal_Int16 nActionLockCount; private: - String GetInputString_Impl(BOOL bEnglish) const; - String GetOutputString_Impl() const; - void SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish); - double GetValue_Impl() const; - void SetValue_Impl(double fValue); + String GetInputString_Impl(BOOL bEnglish) const; + String GetOutputString_Impl() const; + void SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish); + double GetValue_Impl() const; + void SetValue_Impl(double fValue); com::sun::star::table::CellContentType GetResultType_Impl(); protected: @@ -854,35 +854,35 @@ public: static const SfxItemPropertyMap* GetCellPropertyMap(); ScCellObj(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellObj(); + virtual ~ScCellObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); - SvxUnoText& GetUnoText(); + SvxUnoText& GetUnoText(); // XML import needs to set results at formula cells, // not meant for any other purpose. - void SetFormulaResultString( const ::rtl::OUString& rResult ); - void SetFormulaResultDouble( double fResult ); + void SetFormulaResultString( const ::rtl::OUString& rResult ); + void SetFormulaResultDouble( double fResult ); void SetFormulaWithGrammar( const ::rtl::OUString& rFormula, const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); - const ScAddress& GetPosition() const { return aCellPos; } + const ScAddress& GetPosition() const { return aCellPos; } // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -894,11 +894,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -912,7 +912,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -926,10 +926,10 @@ public: // XCell virtual ::rtl::OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) + virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getError() throw(::com::sun::star::uno::RuntimeException); @@ -976,13 +976,13 @@ public: // XActionLockable virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); - static String GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos); + static String GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos); }; @@ -1006,13 +1006,13 @@ class ScTableSheetObj : public ScCellRangeObj, public com::sun::star::sheet::XExternalSheetName, public com::sun::star::document::XEventsSupplier { - friend class ScTableSheetsObj; // fuer insertByName() + friend class ScTableSheetsObj; // fuer insertByName() private: - const SfxItemPropertySet* pSheetPropSet; + const SfxItemPropertySet* pSheetPropSet; - SCTAB GetTab_Impl() const; - void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ); + SCTAB GetTab_Impl() const; + void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ); protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1026,15 +1026,15 @@ protected: public: ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab); - virtual ~ScTableSheetObj(); + virtual ~ScTableSheetObj(); - void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); + void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XSpreadsheet virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > @@ -1065,7 +1065,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XSheetPageBreak @@ -1073,19 +1073,19 @@ public: getColumnPageBreaks() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL getRowPageBreaks() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException); // XCellRangeMovement - virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellInsertMode nMode ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellDeleteMode nMode ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, + virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, + virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) throw(::com::sun::star::uno::RuntimeException); @@ -1116,34 +1116,34 @@ public: ::com::sun::star::table::CellRangeAddress >& aPrintAreas ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) + virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitleColumns( + virtual void SAL_CALL setTitleColumns( const ::com::sun::star::table::CellRangeAddress& aTitleColumns ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintTitleRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) + virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitleRows( + virtual void SAL_CALL setTitleRows( const ::com::sun::star::table::CellRangeAddress& aTitleRows ) throw(::com::sun::star::uno::RuntimeException); // XSheetLinkable virtual ::com::sun::star::sheet::SheetLinkMode SAL_CALL getLinkMode() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) + virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkUrl( const ::rtl::OUString& aLinkUrl ) + virtual void SAL_CALL setLinkUrl( const ::rtl::OUString& aLinkUrl ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkSheetName( const ::rtl::OUString& aLinkSheetName ) + virtual void SAL_CALL setLinkSheetName( const ::rtl::OUString& aLinkSheetName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL link( const ::rtl::OUString& aUrl, + virtual void SAL_CALL link( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName, const ::rtl::OUString& aFilterName, const ::rtl::OUString& aFilterOptions, @@ -1162,30 +1162,30 @@ public: virtual sal_Bool SAL_CALL showErrors( const ::com::sun::star::table::CellAddress& aPosition ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL showInvalid() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException); // XSheetOutline - virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showLevel( sal_Int16 nLevel, + virtual void SAL_CALL showLevel( sal_Int16 nLevel, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); @@ -1193,12 +1193,12 @@ public: // XScenario virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScenarioComment( const ::rtl::OUString& aScenarioComment ) + virtual void SAL_CALL setScenarioComment( const ::rtl::OUString& aScenarioComment ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException); // XScenarioEnhanced virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRanges( ) @@ -1247,7 +1247,7 @@ class ScTableColumnObj : public ScCellRangeObj, public com::sun::star::container::XNamed { private: - const SfxItemPropertySet* pColPropSet; + const SfxItemPropertySet* pColPropSet; protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1261,17 +1261,17 @@ protected: public: ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab); - virtual ~ScTableColumnObj(); + virtual ~ScTableColumnObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet ueberladen wegen Spalten-Properties @@ -1298,7 +1298,7 @@ public: class ScTableRowObj : public ScCellRangeObj { private: - const SfxItemPropertySet* pRowPropSet; + const SfxItemPropertySet* pRowPropSet; protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1312,7 +1312,7 @@ protected: public: ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab); - virtual ~ScTableRowObj(); + virtual ~ScTableRowObj(); // XPropertySet ueberladen wegen Zeilen-Properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > @@ -1335,14 +1335,14 @@ class ScCellsObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - ScRangeList aRanges; + ScDocShell* pDocShell; + ScRangeList aRanges; public: ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellsObj(); + virtual ~ScCellsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL @@ -1369,21 +1369,21 @@ class ScCellsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - ScRangeList aRanges; - ScAddress aPos; - ScMarkData* pMark; - BOOL bAtEnd; + ScDocShell* pDocShell; + ScRangeList aRanges; + ScAddress aPos; + ScMarkData* pMark; + BOOL bAtEnd; private: - void Advance_Impl(); - void CheckPos_Impl(); + void Advance_Impl(); + void CheckPos_Impl(); public: ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellsEnumeration(); + virtual ~ScCellsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -1408,17 +1408,17 @@ class ScCellFormatsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - ScRange aTotalRange; + ScDocShell* pDocShell; + ScRange aTotalRange; private: - ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const; + ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const; public: ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellFormatsObj(); + virtual ~ScCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -1452,22 +1452,22 @@ class ScCellFormatsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - ScAttrRectIterator* pIter; - ScRange aNext; - BOOL bAtEnd; - BOOL bDirty; + ScDocShell* pDocShell; + SCTAB nTab; + ScAttrRectIterator* pIter; + ScRange aNext; + BOOL bAtEnd; + BOOL bDirty; private: - void Advance_Impl(); - ScCellRangeObj* NextObject_Impl(); + void Advance_Impl(); + ScCellRangeObj* NextObject_Impl(); public: ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellFormatsEnumeration(); + virtual ~ScCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -1494,18 +1494,18 @@ class ScUniqueCellFormatsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - ScRange aTotalRange; - ScMyRangeLists aRangeLists; + ScDocShell* pDocShell; + ScRange aTotalRange; + ScMyRangeLists aRangeLists; private: - void GetObjects_Impl(); + void GetObjects_Impl(); public: ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScUniqueCellFormatsObj(); + virtual ~ScUniqueCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -1538,15 +1538,15 @@ class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScMyRangeLists aRangeLists; - ScDocShell* pDocShell; - sal_Int32 nCurrentPosition; + ScMyRangeLists aRangeLists; + ScDocShell* pDocShell; + sal_Int32 nCurrentPosition; public: ScUniqueCellFormatsEnumeration(ScDocShell* pDocShell, const ScMyRangeLists& rRangeLists); - virtual ~ScUniqueCellFormatsEnumeration(); + virtual ~ScUniqueCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx index 4b07ddd0682f..d5bbdd0b738a 100644 --- a/sc/inc/cfgids.hxx +++ b/sc/inc/cfgids.hxx @@ -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,9 +32,9 @@ #define SCCFG_APP (SFX_ITEMTYPE_SC_BEGIN + 2) #define SCCFG_SPELLCHECK (SFX_ITEMTYPE_SC_BEGIN + 3) #define SCCFG_PRINT (SFX_ITEMTYPE_SC_BEGIN + 4) -#define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5) -#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) -#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) +#define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5) +#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) +#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) #endif diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 44737e711090..fe4e63499b6a 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -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 @@ -431,13 +431,13 @@ public: // XUnoTunnel ------------------------------------------------------------ -// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< -// sal_Int8 >& aIdentifier ) -// throw(::com::sun::star::uno::RuntimeException); +// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< +// sal_Int8 >& aIdentifier ) +// throw(::com::sun::star::uno::RuntimeException); -// static const com::sun::star::uno::Sequence& getUnoTunnelId(); -// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< -// com::sun::star::uno::XInterface> xObj ); +// static const com::sun::star::uno::Sequence& getUnoTunnelId(); +// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< +// com::sun::star::uno::XInterface> xObj ); private: void setDataChangedHint(bool b); @@ -455,7 +455,7 @@ private: { public: ExternalRefListener(ScChart2DataSequence& rParent, ScDocument* pDoc); - virtual ~ExternalRefListener(); + virtual ~ExternalRefListener(); virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); @@ -470,9 +470,9 @@ private: ScDocument* mpDoc; }; - /** - * Build an internal data array to cache the data ranges, and other - * information such as hidden values. + /** + * Build an internal data array to cache the data ranges, and other + * information such as hidden values. */ void BuildDataCache(); @@ -513,11 +513,11 @@ private: ::std::list m_aDataArray; - /** - * Cached data for getData. We may also need to cache data for the - * numerical and textural data series if they turn out to be bottlenecks + /** + * Cached data for getData. We may also need to cache data for the + * numerical and textural data series if they turn out to be bottlenecks * under certain scenarios. - */ + */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache; ::com::sun::star::uno::Sequence m_aHiddenValues; @@ -537,7 +537,7 @@ private: RangeIndexMapPtr m_pRangeIndices; ExtRefListenerPtr m_pExtRefListener; com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; - SfxItemPropertySet m_aPropSet; + SfxItemPropertySet m_aPropSet; ::std::auto_ptr m_pHiddenListener; ScLinkListener* m_pValueListener; @@ -668,13 +668,13 @@ public: // XUnoTunnel ------------------------------------------------------------ -// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< -// sal_Int8 >& aIdentifier ) -// throw(::com::sun::star::uno::RuntimeException); +// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< +// sal_Int8 >& aIdentifier ) +// throw(::com::sun::star::uno::RuntimeException); -// static const com::sun::star::uno::Sequence& getUnoTunnelId(); -// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< -// com::sun::star::uno::XInterface> xObj ); +// static const com::sun::star::uno::Sequence& getUnoTunnelId(); +// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< +// com::sun::star::uno::XInterface> xObj ); // Implementation -------------------------------------------------------- @@ -689,7 +689,7 @@ private: ScRangeListRef m_xRanges; ScDocument* m_pDocument; com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; - SfxItemPropertySet m_aPropSet; + SfxItemPropertySet m_aPropSet; sal_Bool m_bColumn; // defines the orientation to create the right labels }; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 62f30a17c62e..9eebf18b787c 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -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 @@ -57,8 +57,8 @@ public: ScMemChart(short nCols, short nRows); ~ScMemChart(); - short GetColCount() const { return nColCnt; } - short GetRowCount() const { return nRowCnt; } + short GetColCount() const { return nColCnt; } + short GetRowCount() const { return nRowCnt; } const String& GetColText(short nCol) const { return pColText[nCol]; } const String& GetRowText(short nRow) const { return pRowText[nRow]; } double GetData(short nCol, short nRow) const { return pData[nCol * nRowCnt + nRow]; } @@ -68,12 +68,12 @@ public: }; -class SC_DLLPUBLIC ScChartArray : public ScDataObject // nur noch Parameter-Struct +class SC_DLLPUBLIC ScChartArray : public ScDataObject // nur noch Parameter-Struct { - String aName; - ScDocument* pDocument; + String aName; + ScDocument* pDocument; ScChartPositioner aPositioner; - BOOL bValid; // fuer Erzeugung aus SchMemChart + BOOL bValid; // fuer Erzeugung aus SchMemChart private: ScMemChart* CreateMemChartSingle(); @@ -87,22 +87,22 @@ public: const String& rChartName ); ScChartArray( const ScChartArray& rArr ); - virtual ~ScChartArray(); - virtual ScDataObject* Clone() const; + virtual ~ScChartArray(); + virtual ScDataObject* Clone() const; - const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } - void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } - void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } + const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } + void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } + void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } - void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } - BOOL HasColHeaders() const { return aPositioner.HasColHeaders(); } - BOOL HasRowHeaders() const { return aPositioner.HasRowHeaders(); } - BOOL IsValid() const { return bValid; } - void SetName(const String& rNew) { aName = rNew; } - const String& GetName() const { return aName; } + void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } + BOOL HasColHeaders() const { return aPositioner.HasColHeaders(); } + BOOL HasRowHeaders() const { return aPositioner.HasRowHeaders(); } + BOOL IsValid() const { return bValid; } + void SetName(const String& rNew) { aName = rNew; } + const String& GetName() const { return aName; } - BOOL operator==(const ScChartArray& rCmp) const; + BOOL operator==(const ScChartArray& rCmp) const; ScMemChart* CreateMemChart(); }; @@ -114,11 +114,11 @@ public: ScChartCollection( const ScChartCollection& rColl ): ScCollection( rColl ) {} - virtual ScDataObject* Clone() const; - ScChartArray* operator[](USHORT nIndex) const + virtual ScDataObject* Clone() const; + ScChartArray* operator[](USHORT nIndex) const { return (ScChartArray*)At(nIndex); } - BOOL operator==(const ScChartCollection& rCmp) const; + BOOL operator==(const ScChartCollection& rCmp) const; }; diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index 50b8586bdace..f5df20e53b8a 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -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/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 26831970d5b7..f41321feaddf 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -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 @@ -73,11 +73,11 @@ private: ::std::auto_ptr mpExtRefListener; ::std::auto_ptr< ::std::vector > mpTokens; - ScChartUnoData* pUnoData; - ScDocument* pDoc; - BOOL bUsed; // fuer ScChartListenerCollection::FreeUnused - BOOL bDirty; - BOOL bSeriesRangesScheduled; + ScChartUnoData* pUnoData; + ScDocument* pDoc; + BOOL bUsed; // fuer ScChartListenerCollection::FreeUnused + BOOL bDirty; + BOOL bSeriesRangesScheduled; // not implemented ScChartListener& operator=( const ScChartListener& ); @@ -90,42 +90,42 @@ public: ScChartListener( const String& rName, ScDocument* pDoc, ::std::vector* pTokens ); ScChartListener( const ScChartListener& ); - virtual ~ScChartListener(); - virtual ScDataObject* Clone() const; + virtual ~ScChartListener(); + virtual ScDataObject* Clone() const; - void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, + void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); - com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; - com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; + com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; + com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; - BOOL IsUno() const { return (pUnoData != NULL); } + BOOL IsUno() const { return (pUnoData != NULL); } - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); - void StartListeningTo(); - void EndListeningTo(); - void ChangeListening( const ScRangeListRef& rRangeListRef, + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); + void StartListeningTo(); + void EndListeningTo(); + void ChangeListening( const ScRangeListRef& rRangeListRef, BOOL bDirty = FALSE ); - void Update(); - ScRangeListRef GetRangeList() const; - void SetRangeList( const ScRangeListRef& rNew ); - void SetRangeList( const ScRange& rNew ); - BOOL IsUsed() const { return bUsed; } - void SetUsed( BOOL bFlg ) { bUsed = bFlg; } - BOOL IsDirty() const { return bDirty; } - void SetDirty( BOOL bFlg ) { bDirty = bFlg; } + void Update(); + ScRangeListRef GetRangeList() const; + void SetRangeList( const ScRangeListRef& rNew ); + void SetRangeList( const ScRange& rNew ); + BOOL IsUsed() const { return bUsed; } + void SetUsed( BOOL bFlg ) { bUsed = bFlg; } + BOOL IsDirty() const { return bDirty; } + void SetDirty( BOOL bFlg ) { bDirty = bFlg; } void UpdateChartIntersecting( const ScRange& rRange ); // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab) - void ScheduleSeriesRanges() { bSeriesRangesScheduled = TRUE; } - void UpdateScheduledSeriesRanges(); - void UpdateSeriesRanges(); + void ScheduleSeriesRanges() { bSeriesRangesScheduled = TRUE; } + void UpdateScheduledSeriesRanges(); + void UpdateSeriesRanges(); ExternalRefListener* GetExtRefListener(); void SetUpdateQueue(); - BOOL operator==( const ScChartListener& ); - BOOL operator!=( const ScChartListener& r ) + BOOL operator==( const ScChartListener& ); + BOOL operator!=( const ScChartListener& r ) { return !operator==( r ); } }; @@ -154,8 +154,8 @@ public: private: ::std::list maHiddenListeners; - Timer aTimer; - ScDocument* pDoc; + Timer aTimer; + ScDocument* pDoc; DECL_LINK( TimerHdl, Timer* ); @@ -167,48 +167,48 @@ private: public: ScChartListenerCollection( ScDocument* pDoc ); ScChartListenerCollection( const ScChartListenerCollection& ); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - virtual ~ScChartListenerCollection(); + virtual ~ScChartListenerCollection(); // nur nach copy-ctor noetig, wenn neu ins Dok gehaengt - void StartAllListeners(); + void StartAllListeners(); - void ChangeListening( const String& rName, + void ChangeListening( const String& rName, const ScRangeListRef& rRangeListRef, BOOL bDirty = FALSE ); // FreeUnused nur wie in ScDocument::UpdateChartListenerCollection verwenden! - void FreeUnused(); - void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, + void FreeUnused(); + void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); - void StartTimer(); - void UpdateDirtyCharts(); + void StartTimer(); + void UpdateDirtyCharts(); void SC_DLLPUBLIC SetDirty(); - void SetDiffDirty( const ScChartListenerCollection&, + void SetDiffDirty( const ScChartListenerCollection&, BOOL bSetChartRangeLists = FALSE ); - void SetRangeDirty( const ScRange& rRange ); // z.B. Zeilen/Spalten + void SetRangeDirty( const ScRange& rRange ); // z.B. Zeilen/Spalten - void UpdateScheduledSeriesRanges(); + void UpdateScheduledSeriesRanges(); void UpdateChartsContainingTab( SCTAB nTab ); - BOOL operator==( const ScChartListenerCollection& ); + BOOL operator==( const ScChartListenerCollection& ); - /** - * Start listening on hide/show change within specified cell range. A - * single listener may listen on multiple ranges when the caller passes - * the same pointer multiple times with different ranges. - * - * Note that the caller is responsible for managing the life-cycle of the - * listener instance. + /** + * Start listening on hide/show change within specified cell range. A + * single listener may listen on multiple ranges when the caller passes + * the same pointer multiple times with different ranges. + * + * Note that the caller is responsible for managing the life-cycle of the + * listener instance. */ - void StartListeningHiddenRange( const ScRange& rRange, + void StartListeningHiddenRange( const ScRange& rRange, ScChartHiddenRangeListener* pListener ); - /** - * Remove all ranges associated with passed listener instance from the - * list of hidden range listeners. This does not delete the passed - * listener instance. + /** + * Remove all ranges associated with passed listener instance from the + * list of hidden range listeners. This does not delete the passed + * listener instance. */ void EndListeningHiddenRange( ScChartHiddenRangeListener* pListener ); }; diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 16f0fdd2cf4c..45dcd56ec829 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -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 @@ -44,7 +44,7 @@ class ScChartLockGuard { public: ScChartLockGuard( ScDocument* pDoc ); - virtual ~ScChartLockGuard(); + virtual ~ScChartLockGuard(); void AlsoLockThisChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); @@ -64,18 +64,18 @@ class ScTemporaryChartLock { public: ScTemporaryChartLock( ScDocument* pDoc ); - virtual ~ScTemporaryChartLock(); - - void StartOrContinueLocking(); - void StopLocking(); + virtual ~ScTemporaryChartLock(); + + void StartOrContinueLocking(); + void StopLocking(); void AlsoLockThisChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); private: - ScDocument* mpDoc; - Timer maTimer; + ScDocument* mpDoc; + Timer maTimer; std::auto_ptr< ScChartLockGuard > mapScChartLockGuard; - + DECL_LINK( TimeoutHdl, Timer* ); ScTemporaryChartLock(); diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 84ffd2e877e2..44c92a09efe1 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -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 @@ -41,37 +41,37 @@ class ScChartPositionMap { friend class ScChartPositioner; - ScAddress** ppData; - ScAddress** ppColHeader; - ScAddress** ppRowHeader; - ULONG nCount; - SCCOL nColCount; - SCROW nRowCount; + ScAddress** ppData; + ScAddress** ppColHeader; + ScAddress** ppRowHeader; + ULONG nCount; + SCCOL nColCount; + SCROW nRowCount; ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, - SCCOL nColAdd, // Header-Spalten - SCROW nRowAdd, // Header-Zeilen - Table& rCols // Table mit Col-Tables mit Address* + SCCOL nColAdd, // Header-Spalten + SCROW nRowAdd, // Header-Zeilen + Table& rCols // Table mit Col-Tables mit Address* ); - ~ScChartPositionMap(); //! deletes all ScAddress* + ~ScChartPositionMap(); //! deletes all ScAddress* // not implemented ScChartPositionMap( const ScChartPositionMap& ); - ScChartPositionMap& operator=( const ScChartPositionMap& ); + ScChartPositionMap& operator=( const ScChartPositionMap& ); public: - ULONG GetCount() const { return nCount; } - SCCOL GetColCount() const { return nColCount; } - SCROW GetRowCount() const { return nRowCount; } + ULONG GetCount() const { return nCount; } + SCCOL GetColCount() const { return nColCount; } + SCROW GetRowCount() const { return nRowCount; } - BOOL IsValid( SCCOL nCol, SCROW nRow ) const + BOOL IsValid( SCCOL nCol, SCROW nRow ) const { return nCol < nColCount && nRow < nRowCount; } // Daten spaltenweise - ULONG GetIndex( SCCOL nCol, SCROW nRow ) const + ULONG GetIndex( SCCOL nCol, SCROW nRow ) const { return (ULONG) nCol * nRowCount + nRow; } - const ScAddress* GetPosition( ULONG nIndex ) const + const ScAddress* GetPosition( ULONG nIndex ) const { if ( nIndex < nCount ) return ppData[ nIndex ]; @@ -79,56 +79,56 @@ public: } //! kann NULL sein und damit "kein Wert" - const ScAddress* GetPosition( SCCOL nChartCol, SCROW nChartRow ) const + const ScAddress* GetPosition( SCCOL nChartCol, SCROW nChartRow ) const { if ( IsValid( nChartCol, nChartRow ) ) return ppData[ GetIndex( nChartCol, nChartRow ) ]; return NULL; } - const ScAddress* GetColHeaderPosition( SCCOL nChartCol ) const + const ScAddress* GetColHeaderPosition( SCCOL nChartCol ) const { if ( nChartCol < nColCount ) return ppColHeader[ nChartCol ]; return NULL; } - const ScAddress* GetRowHeaderPosition( SCROW nChartRow ) const + const ScAddress* GetRowHeaderPosition( SCROW nChartRow ) const { if ( nChartRow < nRowCount ) return ppRowHeader[ nChartRow ]; return NULL; } -//UNUSED2009-05 ScRangeListRef GetColRanges( SCCOL nChartCol ) const; -//UNUSED2009-05 ScRangeListRef GetRowRanges( SCROW nChartRow ) const; +//UNUSED2009-05 ScRangeListRef GetColRanges( SCCOL nChartCol ) const; +//UNUSED2009-05 ScRangeListRef GetRowRanges( SCROW nChartRow ) const; }; enum ScChartGlue { SC_CHARTGLUE_NA, SC_CHARTGLUE_NONE, // alte Mimik - SC_CHARTGLUE_COLS, // alte Mimik + SC_CHARTGLUE_COLS, // alte Mimik SC_CHARTGLUE_ROWS, SC_CHARTGLUE_BOTH }; class ScDocument; -class ScChartPositioner // nur noch Parameter-Struct +class ScChartPositioner // nur noch Parameter-Struct { - ScRangeListRef aRangeListRef; - ScDocument* pDocument; + ScRangeListRef aRangeListRef; + ScDocument* pDocument; ScChartPositionMap* pPositionMap; - ScChartGlue eGlue; - SCCOL nStartCol; - SCROW nStartRow; - BOOL bColHeaders; - BOOL bRowHeaders; - BOOL bDummyUpperLeft; + ScChartGlue eGlue; + SCCOL nStartCol; + SCROW nStartRow; + BOOL bColHeaders; + BOOL bRowHeaders; + BOOL bDummyUpperLeft; private: - void CheckColRowHeaders(); + void CheckColRowHeaders(); - void GlueState(); // zusammengefasste Bereiche - void CreatePositionMap(); + void GlueState(); // zusammengefasste Bereiche + void CreatePositionMap(); public: ScChartPositioner( ScDocument* pDoc, SCTAB nTab, @@ -137,23 +137,23 @@ public: ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rRangeList ); ScChartPositioner( const ScChartPositioner& rPositioner ); - virtual ~ScChartPositioner(); + virtual ~ScChartPositioner(); - const ScRangeListRef& GetRangeList() const { return aRangeListRef; } - void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } - void SetRangeList( const ScRange& rNew ); + const ScRangeListRef& GetRangeList() const { return aRangeListRef; } + void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } + void SetRangeList( const ScRange& rNew ); - void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } - BOOL HasColHeaders() const { return bColHeaders; } - BOOL HasRowHeaders() const { return bRowHeaders; } + void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } + BOOL HasColHeaders() const { return bColHeaders; } + BOOL HasRowHeaders() const { return bRowHeaders; } void SetDummyUpperLeft(BOOL bNew) { bDummyUpperLeft = bNew; } void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } - BOOL operator==(const ScChartPositioner& rCmp) const; + BOOL operator==(const ScChartPositioner& rCmp) const; - void InvalidateGlue() + void InvalidateGlue() { eGlue = SC_CHARTGLUE_NA; if ( pPositionMap ) @@ -162,7 +162,7 @@ public: pPositionMap = NULL; } } - const ScChartPositionMap* GetPositionMap(); + const ScChartPositionMap* GetPositionMap(); }; diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index fe261f26e517..4545ad03fe04 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -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 @@ -58,26 +58,26 @@ class ScChartsObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Charts sind pro Sheet + ScDocShell* pDocShell; + SCTAB nTab; // Charts sind pro Sheet - ScChartObj* GetObjectByIndex_Impl(long nIndex) const; - ScChartObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScChartObj* GetObjectByIndex_Impl(long nIndex) const; + ScChartObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScChartsObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScChartsObj(); + virtual ~ScChartsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableCharts - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::awt::Rectangle& aRect, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -132,12 +132,12 @@ class ScChartObj : public ::comphelper::OBaseMutex ,public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Charts sind pro Sheet - String aChartName; + ScDocShell* pDocShell; + SCTAB nTab; // Charts sind pro Sheet + String aChartName; - void Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, bool bRowHeaders ); - void GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& rRowHeaders ) const; + void Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, bool bRowHeaders ); + void GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& rRowHeaders ) const; protected: // ::comphelper::OPropertySetHelper @@ -152,9 +152,9 @@ protected: public: ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN); - virtual ~ScChartObj(); + virtual ~ScChartObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XInterface DECLARE_XINTERFACE() @@ -167,14 +167,14 @@ public: // XTableChart virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) + virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) + virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRanges( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException); @@ -184,7 +184,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 6cf3d59314ef..511ff382ab60 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -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 @@ -101,14 +101,14 @@ class ScChangeActionLinkEntry // not implemented, prevent usage ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ); - ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ); + ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ); protected: - ScChangeActionLinkEntry* pNext; - ScChangeActionLinkEntry** ppPrev; - ScChangeAction* pAction; - ScChangeActionLinkEntry* pLink; + ScChangeActionLinkEntry* pNext; + ScChangeActionLinkEntry** ppPrev; + ScChangeAction* pAction; + ScChangeActionLinkEntry* pLink; public: @@ -117,7 +117,7 @@ public: ScChangeActionLinkEntry( ScChangeActionLinkEntry** ppPrevP, ScChangeAction* pActionP ) - : pNext( *ppPrevP ), + : pNext( *ppPrevP ), ppPrev( ppPrevP ), pAction( pActionP ), pLink( NULL ) @@ -127,7 +127,7 @@ public: *ppPrevP = this; } - virtual ~ScChangeActionLinkEntry() + virtual ~ScChangeActionLinkEntry() { ScChangeActionLinkEntry* p = pLink; UnLink(); @@ -136,7 +136,7 @@ public: delete p; } - void SetLink( ScChangeActionLinkEntry* pLinkP ) + void SetLink( ScChangeActionLinkEntry* pLinkP ) { UnLink(); if ( pLinkP ) @@ -146,7 +146,7 @@ public: } } - void UnLink() + void UnLink() { if ( pLink ) { @@ -155,17 +155,17 @@ public: } } - void Remove() + void Remove() { if ( ppPrev ) { if ( ( *ppPrev = pNext ) != NULL ) pNext->ppPrev = ppPrev; - ppPrev = NULL; // not inserted + ppPrev = NULL; // not inserted } } - void Insert( ScChangeActionLinkEntry** ppPrevP ) + void Insert( ScChangeActionLinkEntry** ppPrevP ) { if ( !ppPrev ) { @@ -176,12 +176,12 @@ public: } } - const ScChangeActionLinkEntry* GetLink() const { return pLink; } - ScChangeActionLinkEntry* GetLink() { return pLink; } - const ScChangeActionLinkEntry* GetNext() const { return pNext; } - ScChangeActionLinkEntry* GetNext() { return pNext; } - const ScChangeAction* GetAction() const { return pAction; } - ScChangeAction* GetAction() { return pAction; } + const ScChangeActionLinkEntry* GetLink() const { return pLink; } + ScChangeActionLinkEntry* GetLink() { return pLink; } + const ScChangeActionLinkEntry* GetNext() const { return pNext; } + ScChangeActionLinkEntry* GetNext() { return pNext; } + const ScChangeAction* GetAction() const { return pAction; } + ScChangeAction* GetAction() { return pAction; } #if DEBUG_CHANGETRACK String ToString() const; #endif // DEBUG_CHANGETRACK @@ -198,13 +198,13 @@ class ScChangeActionCellListEntry friend class ScChangeActionMove; friend class ScChangeTrack; - ScChangeActionCellListEntry* pNext; - ScChangeActionContent* pContent; + ScChangeActionCellListEntry* pNext; + ScChangeActionContent* pContent; ScChangeActionCellListEntry( ScChangeActionContent* pContentP, ScChangeActionCellListEntry* pNextP ) - : pNext( pNextP ), + : pNext( pNextP ), pContent( pContentP ) {} @@ -232,28 +232,28 @@ class ScChangeAction // not implemented, prevent usage ScChangeAction( const ScChangeAction& ); - ScChangeAction& operator=( const ScChangeAction& ); + ScChangeAction& operator=( const ScChangeAction& ); protected: - ScBigRange aBigRange; // Ins/Del/MoveTo/ContentPos - DateTime aDateTime; //! UTC - String aUser; // wer war's - String aComment; // Benutzerkommentar - ScChangeAction* pNext; // naechster in Kette - ScChangeAction* pPrev; // vorheriger in Kette - ScChangeActionLinkEntry* pLinkAny; // irgendwelche Links - ScChangeActionLinkEntry* pLinkDeletedIn; // Zuordnung zu + ScBigRange aBigRange; // Ins/Del/MoveTo/ContentPos + DateTime aDateTime; //! UTC + String aUser; // wer war's + String aComment; // Benutzerkommentar + ScChangeAction* pNext; // naechster in Kette + ScChangeAction* pPrev; // vorheriger in Kette + ScChangeActionLinkEntry* pLinkAny; // irgendwelche Links + ScChangeActionLinkEntry* pLinkDeletedIn; // Zuordnung zu // geloeschten oder // druebergemoveten oder // rejecteten Insert // Bereichen - ScChangeActionLinkEntry* pLinkDeleted; // Links zu geloeschten - ScChangeActionLinkEntry* pLinkDependent; // Links zu abhaengigen - ULONG nAction; - ULONG nRejectAction; - ScChangeActionType eType; - ScChangeActionState eState; + ScChangeActionLinkEntry* pLinkDeleted; // Links zu geloeschten + ScChangeActionLinkEntry* pLinkDependent; // Links zu abhaengigen + ULONG nAction; + ULONG nRejectAction; + ScChangeActionType eType; + ScChangeActionState eState; ScChangeAction( ScChangeActionType, @@ -273,21 +273,21 @@ protected: const ScBigRange&, const ULONG nAction); - virtual ~ScChangeAction(); + virtual ~ScChangeAction(); - String GetRefString( const ScBigRange&, + String GetRefString( const ScBigRange&, ScDocument*, BOOL bFlag3D = FALSE ) const; - void SetActionNumber( ULONG n ) { nAction = n; } - void SetRejectAction( ULONG n ) { nRejectAction = n; } - void SetUser( const String& r ) { aUser = r; } - void SetType( ScChangeActionType e ) { eType = e; } - void SetState( ScChangeActionState e ) { eState = e; } - void SetRejected(); + void SetActionNumber( ULONG n ) { nAction = n; } + void SetRejectAction( ULONG n ) { nRejectAction = n; } + void SetUser( const String& r ) { aUser = r; } + void SetType( ScChangeActionType e ) { eType = e; } + void SetState( ScChangeActionState e ) { eState = e; } + void SetRejected(); - ScBigRange& GetBigRange() { return aBigRange; } + ScBigRange& GetBigRange() { return aBigRange; } - ScChangeActionLinkEntry* AddLink( ScChangeAction* p, + ScChangeActionLinkEntry* AddLink( ScChangeAction* p, ScChangeActionLinkEntry* pL ) { ScChangeActionLinkEntry* pLnk = @@ -296,50 +296,50 @@ protected: pLnk->SetLink( pL ); return pLnk; } - void RemoveAllAnyLinks(); + void RemoveAllAnyLinks(); - virtual ScChangeActionLinkEntry* GetDeletedIn() const + virtual ScChangeActionLinkEntry* GetDeletedIn() const { return pLinkDeletedIn; } - virtual ScChangeActionLinkEntry** GetDeletedInAddress() + virtual ScChangeActionLinkEntry** GetDeletedInAddress() { return &pLinkDeletedIn; } - ScChangeActionLinkEntry* AddDeletedIn( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDeletedIn( ScChangeAction* p ) { return new ScChangeActionLinkEntry( GetDeletedInAddress(), p ); } - BOOL RemoveDeletedIn( const ScChangeAction* ); - void SetDeletedIn( ScChangeAction* ); + BOOL RemoveDeletedIn( const ScChangeAction* ); + void SetDeletedIn( ScChangeAction* ); - ScChangeActionLinkEntry* AddDeleted( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDeleted( ScChangeAction* p ) { return new ScChangeActionLinkEntry( &pLinkDeleted, p ); } - void RemoveAllDeleted(); + void RemoveAllDeleted(); - ScChangeActionLinkEntry* AddDependent( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDependent( ScChangeAction* p ) { return new ScChangeActionLinkEntry( &pLinkDependent, p ); } - void RemoveAllDependent(); + void RemoveAllDependent(); - void RemoveAllLinks(); + void RemoveAllLinks(); - virtual void AddContent( ScChangeActionContent* ) = 0; - virtual void DeleteCellEntries() = 0; + virtual void AddContent( ScChangeActionContent* ) = 0; + virtual void DeleteCellEntries() = 0; - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - void Accept(); - virtual BOOL Reject( ScDocument* ) = 0; - void RejectRestoreContents( ScChangeTrack*, + void Accept(); + virtual BOOL Reject( ScDocument* ) = 0; + void RejectRestoreContents( ScChangeTrack*, SCsCOL nDx, SCsROW nDy ); // used in Reject() instead of IsRejectable() - BOOL IsInternalRejectable() const; + BOOL IsInternalRejectable() const; // Derived classes that hold a pointer to the // ChangeTrack must return that. Otherwise NULL. @@ -347,107 +347,107 @@ protected: public: - BOOL IsInsertType() const + BOOL IsInsertType() const { return eType == SC_CAT_INSERT_COLS || eType == SC_CAT_INSERT_ROWS || eType == SC_CAT_INSERT_TABS; } - BOOL IsDeleteType() const + BOOL IsDeleteType() const { return eType == SC_CAT_DELETE_COLS || eType == SC_CAT_DELETE_ROWS || eType == SC_CAT_DELETE_TABS; } - BOOL IsVirgin() const + BOOL IsVirgin() const { return eState == SC_CAS_VIRGIN; } - BOOL IsAccepted() const + BOOL IsAccepted() const { return eState == SC_CAS_ACCEPTED; } - BOOL IsRejected() const + BOOL IsRejected() const { return eState == SC_CAS_REJECTED; } // Action rejects another Action - BOOL IsRejecting() const + BOOL IsRejecting() const { return nRejectAction != 0; } // ob Action im Dokument sichtbar ist - BOOL IsVisible() const; + BOOL IsVisible() const; // ob Action anfassbar ist - BOOL IsTouchable() const; + BOOL IsTouchable() const; // ob Action ein Eintrag in Dialog-Root ist - BOOL IsDialogRoot() const; + BOOL IsDialogRoot() const; // ob ein Eintrag im Dialog aufklappbar sein soll - BOOL IsDialogParent() const; + BOOL IsDialogParent() const; // ob Action ein Delete ist, unter dem // aufgeklappt mehrere einzelne Deletes sind - BOOL IsMasterDelete() const; + BOOL IsMasterDelete() const; // ob Action akzeptiert/selektiert/abgelehnt // werden kann - BOOL IsClickable() const; + BOOL IsClickable() const; // ob Action abgelehnt werden kann - BOOL IsRejectable() const; + BOOL IsRejectable() const; - const ScBigRange& GetBigRange() const { return aBigRange; } - SC_DLLPUBLIC DateTime GetDateTime() const; // local time - const DateTime& GetDateTimeUTC() const // UTC time + const ScBigRange& GetBigRange() const { return aBigRange; } + SC_DLLPUBLIC DateTime GetDateTime() const; // local time + const DateTime& GetDateTimeUTC() const // UTC time { return aDateTime; } - const String& GetUser() const { return aUser; } - const String& GetComment() const { return aComment; } - ScChangeActionType GetType() const { return eType; } - ScChangeActionState GetState() const { return eState; } - ULONG GetActionNumber() const { return nAction; } - ULONG GetRejectAction() const { return nRejectAction; } + const String& GetUser() const { return aUser; } + const String& GetComment() const { return aComment; } + ScChangeActionType GetType() const { return eType; } + ScChangeActionState GetState() const { return eState; } + ULONG GetActionNumber() const { return nAction; } + ULONG GetRejectAction() const { return nRejectAction; } - ScChangeAction* GetNext() const { return pNext; } - ScChangeAction* GetPrev() const { return pPrev; } + ScChangeAction* GetNext() const { return pNext; } + ScChangeAction* GetPrev() const { return pPrev; } - BOOL IsDeletedIn() const + BOOL IsDeletedIn() const { return GetDeletedIn() != NULL; } - BOOL IsDeleted() const + BOOL IsDeleted() const { return IsDeleteType() || IsDeletedIn(); } - BOOL IsDeletedIn( const ScChangeAction* ) const; - BOOL IsDeletedInDelType( ScChangeActionType ) const; + BOOL IsDeletedIn( const ScChangeAction* ) const; + BOOL IsDeletedInDelType( ScChangeActionType ) const; void RemoveAllDeletedIn(); const ScChangeActionLinkEntry* GetFirstDeletedEntry() const { return pLinkDeleted; } const ScChangeActionLinkEntry* GetFirstDependentEntry() const { return pLinkDependent; } - BOOL HasDependent() const + BOOL HasDependent() const { return pLinkDependent != NULL; } - BOOL HasDeleted() const + BOOL HasDeleted() const { return pLinkDeleted != NULL; } // Description wird an String angehaengt. // Mit bSplitRange wird bei Delete nur // eine Spalte/Zeile beruecksichtigt (fuer // Auflistung der einzelnen Eintraege). - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; // fuer DocumentMerge altes Datum einer anderen // Action setzen, mit GetDateTimeUTC geholt - void SetDateTimeUTC( const DateTime& rDT ) + void SetDateTimeUTC( const DateTime& rDT ) { aDateTime = rDT; } // Benutzerkommentar setzen - void SetComment( const String& rStr ) + void SetComment( const String& rStr ) { aComment = rStr; } // only to be used in the XML import - void SetDeletedInThis( ULONG nActionNumber, + void SetDeletedInThis( ULONG nActionNumber, const ScChangeTrack* pTrack ); // only to be used in the XML import - void AddDependent( ULONG nActionNumber, + void AddDependent( ULONG nActionNumber, const ScChangeTrack* pTrack ); #if DEBUG_CHANGETRACK String ToString( ScDocument* pDoc ) const; @@ -462,12 +462,12 @@ class ScChangeActionIns : public ScChangeAction friend class ScChangeTrack; ScChangeActionIns( const ScRange& rRange ); - virtual ~ScChangeActionIns(); + virtual ~ScChangeActionIns(); - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } @@ -481,7 +481,7 @@ public: const String &sComment, const ScChangeActionType eType); // only to use in the XML import - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; }; @@ -495,15 +495,15 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry friend class ScChangeActionDel; friend class ScChangeTrack; - short nCutOffFrom; - short nCutOffTo; + short nCutOffFrom; + short nCutOffTo; ScChangeActionDelMoveEntry( ScChangeActionDelMoveEntry** ppPrevP, ScChangeActionMove* pMove, short nFrom, short nTo ) - : ScChangeActionLinkEntry( + : ScChangeActionLinkEntry( (ScChangeActionLinkEntry**) ppPrevP, (ScChangeAction*) pMove ), @@ -511,30 +511,30 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry nCutOffTo( nTo ) {} - ScChangeActionDelMoveEntry* GetNext() + ScChangeActionDelMoveEntry* GetNext() { return (ScChangeActionDelMoveEntry*) ScChangeActionLinkEntry::GetNext(); } - ScChangeActionMove* GetMove() + ScChangeActionMove* GetMove() { return (ScChangeActionMove*) ScChangeActionLinkEntry::GetAction(); } public: - const ScChangeActionDelMoveEntry* GetNext() const + const ScChangeActionDelMoveEntry* GetNext() const { return (const ScChangeActionDelMoveEntry*) ScChangeActionLinkEntry::GetNext(); } - const ScChangeActionMove* GetMove() const + const ScChangeActionMove* GetMove() const { return (const ScChangeActionMove*) ScChangeActionLinkEntry::GetAction(); } - short GetCutOffFrom() const { return nCutOffFrom; } - short GetCutOffTo() const { return nCutOffTo; } + short GetCutOffFrom() const { return nCutOffFrom; } + short GetCutOffTo() const { return nCutOffTo; } }; @@ -543,31 +543,31 @@ class ScChangeActionDel : public ScChangeAction friend class ScChangeTrack; friend void ScChangeAction::Accept(); - ScChangeTrack* pTrack; + ScChangeTrack* pTrack; ScChangeActionCellListEntry* pFirstCell; - ScChangeActionIns* pCutOff; // abgeschnittener Insert - short nCutOff; // +: Start -: End + ScChangeActionIns* pCutOff; // abgeschnittener Insert + short nCutOff; // +: Start -: End ScChangeActionDelMoveEntry* pLinkMove; - SCsCOL nDx; - SCsROW nDy; + SCsCOL nDx; + SCsROW nDy; ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* ); - virtual ~ScChangeActionDel(); + virtual ~ScChangeActionDel(); - ScChangeActionIns* GetCutOffInsert() { return pCutOff; } + ScChangeActionIns* GetCutOffInsert() { return pCutOff; } - virtual void AddContent( ScChangeActionContent* ); - virtual void DeleteCellEntries(); + virtual void AddContent( ScChangeActionContent* ); + virtual void DeleteCellEntries(); - void UndoCutOffMoves(); - void UndoCutOffInsert(); + void UndoCutOffMoves(); + void UndoCutOffInsert(); - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } @@ -586,37 +586,37 @@ public: // ob dieses das unterste einer Reihe (oder // auch einzeln) ist - BOOL IsBaseDelete() const; + BOOL IsBaseDelete() const; // ob dieses das oberste einer Reihe (oder // auch einzeln) ist - BOOL IsTopDelete() const; + BOOL IsTopDelete() const; // ob dieses ein Teil einer Reihe ist - BOOL IsMultiDelete() const; + BOOL IsMultiDelete() const; // ob es eine Col ist, die zu einem TabDelete gehoert - BOOL IsTabDeleteCol() const; + BOOL IsTabDeleteCol() const; - SCsCOL GetDx() const { return nDx; } - SCsROW GetDy() const { return nDy; } - ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } + ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) const ScChangeActionCellListEntry* GetFirstCellEntry() const { return pFirstCell; } const ScChangeActionDelMoveEntry* GetFirstMoveEntry() const { return pLinkMove; } - const ScChangeActionIns* GetCutOffInsert() const { return pCutOff; } - short GetCutOffCount() const { return nCutOff; } + const ScChangeActionIns* GetCutOffInsert() const { return pCutOff; } + short GetCutOffCount() const { return nCutOff; } - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - void SetCutOffInsert( ScChangeActionIns* p, short n ) - { pCutOff = p; nCutOff = n; } // only to use in the XML import + void SetCutOffInsert( ScChangeActionIns* p, short n ) + { pCutOff = p; nCutOff = n; } // only to use in the XML import // this should be protected, but for the XML import it is public // only to use in the XML import // this should be protected, but for the XML import it is public - ScChangeActionDelMoveEntry* AddCutOffMove( ScChangeActionMove* pMove, + ScChangeActionDelMoveEntry* AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) { return new ScChangeActionDelMoveEntry( @@ -632,11 +632,11 @@ class ScChangeActionMove : public ScChangeAction friend class ScChangeTrack; friend class ScChangeActionDel; - ScBigRange aFromRange; - ScChangeTrack* pTrack; + ScBigRange aFromRange; + ScChangeTrack* pTrack; ScChangeActionCellListEntry* pFirstCell; - ULONG nStartLastCut; // fuer PasteCut Undo - ULONG nEndLastCut; + ULONG nStartLastCut; // fuer PasteCut Undo + ULONG nEndLastCut; ScChangeActionMove( const ScRange& rFromRange, const ScRange& rToRange, @@ -648,23 +648,23 @@ class ScChangeActionMove : public ScChangeAction nStartLastCut(0), nEndLastCut(0) {} - virtual ~ScChangeActionMove(); + virtual ~ScChangeActionMove(); - virtual void AddContent( ScChangeActionContent* ); - virtual void DeleteCellEntries(); + virtual void AddContent( ScChangeActionContent* ); + virtual void DeleteCellEntries(); - ScBigRange& GetFromRange() { return aFromRange; } + ScBigRange& GetFromRange() { return aFromRange; } - void SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; } - ULONG GetStartLastCut() const { return nStartLastCut; } - void SetEndLastCut( ULONG nVal ) { nEndLastCut = nVal; } - ULONG GetEndLastCut() const { return nEndLastCut; } + void SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; } + ULONG GetStartLastCut() const { return nStartLastCut; } + void SetEndLastCut( ULONG nVal ) { nEndLastCut = nVal; } + ULONG GetEndLastCut() const { return nEndLastCut; } - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } @@ -684,13 +684,13 @@ public: const ScChangeActionCellListEntry* GetFirstCellEntry() const { return pFirstCell; } // only to use in the XML export - const ScBigRange& GetFromRange() const { return aFromRange; } - SC_DLLPUBLIC void GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const; + const ScBigRange& GetFromRange() const { return aFromRange; } + SC_DLLPUBLIC void GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const; - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; }; @@ -711,16 +711,16 @@ class ScChangeActionContent : public ScChangeAction { friend class ScChangeTrack; - String aOldValue; - String aNewValue; - ScBaseCell* pOldCell; - ScBaseCell* pNewCell; - ScChangeActionContent* pNextContent; // an gleicher Position - ScChangeActionContent* pPrevContent; - ScChangeActionContent* pNextInSlot; // in gleichem Slot - ScChangeActionContent** ppPrevInSlot; + String aOldValue; + String aNewValue; + ScBaseCell* pOldCell; + ScBaseCell* pNewCell; + ScChangeActionContent* pNextContent; // an gleicher Position + ScChangeActionContent* pPrevContent; + ScChangeActionContent* pNextInSlot; // in gleichem Slot + ScChangeActionContent** ppPrevInSlot; - void InsertInSlot( ScChangeActionContent** pp ) + void InsertInSlot( ScChangeActionContent** pp ) { if ( !ppPrevInSlot ) { @@ -730,74 +730,74 @@ class ScChangeActionContent : public ScChangeAction *pp = this; } } - void RemoveFromSlot() + void RemoveFromSlot() { if ( ppPrevInSlot ) { if ( ( *ppPrevInSlot = pNextInSlot ) != NULL ) pNextInSlot->ppPrevInSlot = ppPrevInSlot; - ppPrevInSlot = NULL; // not inserted + ppPrevInSlot = NULL; // not inserted } } - ScChangeActionContent* GetNextInSlot() { return pNextInSlot; } + ScChangeActionContent* GetNextInSlot() { return pNextInSlot; } - void ClearTrack(); + void ClearTrack(); - static void GetStringOfCell( String& rStr, + static void GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, const ScAddress& rPos ); - static void GetStringOfCell( String& rStr, + static void GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, ULONG nFormat ); - static void SetValue( String& rStr, ScBaseCell*& pCell, + static void SetValue( String& rStr, ScBaseCell*& pCell, const ScAddress& rPos, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ); - static void SetValue( String& rStr, ScBaseCell*& pCell, + static void SetValue( String& rStr, ScBaseCell*& pCell, ULONG nFormat, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ); - static void SetCell( String& rStr, ScBaseCell* pCell, + static void SetCell( String& rStr, ScBaseCell* pCell, ULONG nFormat, const ScDocument* pDoc ); - static BOOL NeedsNumberFormat( const ScBaseCell* ); + static BOOL NeedsNumberFormat( const ScBaseCell* ); - void SetValueString( String& rValue, - ScBaseCell*& pCell, const String& rStr, + void SetValueString( String& rValue, + ScBaseCell*& pCell, const String& rStr, ScDocument* pDoc ); - void GetValueString( String& rStr, + void GetValueString( String& rStr, const String& rValue, const ScBaseCell* pCell ) const; - void GetFormulaString( String& rStr, + void GetFormulaString( String& rStr, const ScFormulaCell* pCell ) const; - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } // pRejectActions!=NULL: reject actions get // stacked, no SetNewValue, no Append - BOOL Select( ScDocument*, ScChangeTrack*, + BOOL Select( ScDocument*, ScChangeTrack*, BOOL bOldest, Stack* pRejectActions ); - void PutValueToDoc( ScBaseCell*, const String&, + void PutValueToDoc( ScBaseCell*, const String&, ScDocument*, SCsCOL nDx, SCsROW nDy ) const; protected: @@ -831,82 +831,82 @@ public: const ScBigRange& aBigRange, ScDocument* pDoc, const String& sNewValue); // to use for XML Import of Generated Actions - virtual ~ScChangeActionContent(); + virtual ~ScChangeActionContent(); - ScChangeActionContent* GetNextContent() const { return pNextContent; } - ScChangeActionContent* GetPrevContent() const { return pPrevContent; } - ScChangeActionContent* GetTopContent() const; - BOOL IsTopContent() const + ScChangeActionContent* GetNextContent() const { return pNextContent; } + ScChangeActionContent* GetPrevContent() const { return pPrevContent; } + ScChangeActionContent* GetTopContent() const; + BOOL IsTopContent() const { return pNextContent == NULL; } - virtual ScChangeActionLinkEntry* GetDeletedIn() const; - virtual ScChangeActionLinkEntry** GetDeletedInAddress(); + virtual ScChangeActionLinkEntry* GetDeletedIn() const; + virtual ScChangeActionLinkEntry** GetDeletedInAddress(); - void PutOldValueToDoc( ScDocument*, + void PutOldValueToDoc( ScDocument*, SCsCOL nDx, SCsROW nDy ) const; - void PutNewValueToDoc( ScDocument*, + void PutNewValueToDoc( ScDocument*, SCsCOL nDx, SCsROW nDy ) const; - void SetOldValue( const ScBaseCell*, + void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc, ULONG nFormat ); - void SetOldValue( const ScBaseCell*, + void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc ); - void SetNewValue( const ScBaseCell*, ScDocument* ); + void SetNewValue( const ScBaseCell*, ScDocument* ); // Used in import filter AppendContentOnTheFly, // takes ownership of cells. - void SetOldNewCells( ScBaseCell* pOldCell, + void SetOldNewCells( ScBaseCell* pOldCell, ULONG nOldFormat, ScBaseCell* pNewCell, ULONG nNewFormat, ScDocument* pDoc ); // Use this only in the XML import, // takes ownership of cell. - void SetNewCell( ScBaseCell* pCell, ScDocument* pDoc, const String& rFormatted ); + void SetNewCell( ScBaseCell* pCell, ScDocument* pDoc, const String& rFormatted ); // These functions should be protected but for // the XML import they are public. - void SetNextContent( ScChangeActionContent* p ) + void SetNextContent( ScChangeActionContent* p ) { pNextContent = p; } - void SetPrevContent( ScChangeActionContent* p ) + void SetPrevContent( ScChangeActionContent* p ) { pPrevContent = p; } // moeglichst nicht verwenden, // setzt nur String bzw. generiert Formelzelle - void SetOldValue( const String& rOld, ScDocument* ); - void SetNewValue( const String& rNew, ScDocument* ); - - void GetOldString( String& ) const; - void GetNewString( String& ) const; - const ScBaseCell* GetOldCell() const { return pOldCell; } - const ScBaseCell* GetNewCell() const { return pNewCell; } - virtual void GetDescription( String&, ScDocument*, + void SetOldValue( const String& rOld, ScDocument* ); + void SetNewValue( const String& rNew, ScDocument* ); + + void GetOldString( String& ) const; + void GetNewString( String& ) const; + const ScBaseCell* GetOldCell() const { return pOldCell; } + const ScBaseCell* GetNewCell() const { return pNewCell; } + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; - static ScChangeActionContentCellType GetContentCellType( const ScBaseCell* ); + static ScChangeActionContentCellType GetContentCellType( const ScBaseCell* ); // NewCell - BOOL IsMatrixOrigin() const + BOOL IsMatrixOrigin() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATORG; } - BOOL IsMatrixReference() const + BOOL IsMatrixReference() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATREF; } // OldCell - BOOL IsOldMatrixOrigin() const + BOOL IsOldMatrixOrigin() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATORG; } - BOOL IsOldMatrixReference() const + BOOL IsOldMatrixReference() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATREF; @@ -931,10 +931,10 @@ class ScChangeActionReject : public ScChangeAction SetState( SC_CAS_ACCEPTED ); } - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ) { return FALSE; } + virtual BOOL Reject( ScDocument* ) { return FALSE; } virtual const ScChangeTrack* GetChangeTrack() const { return 0; } @@ -954,19 +954,19 @@ public: enum ScChangeTrackMsgType { SC_CTM_NONE, - SC_CTM_APPEND, // Actions angehaengt - SC_CTM_REMOVE, // Actions weggenommen - SC_CTM_CHANGE, // Actions geaendert - SC_CTM_PARENT // war kein Parent und ist jetzt einer + SC_CTM_APPEND, // Actions angehaengt + SC_CTM_REMOVE, // Actions weggenommen + SC_CTM_CHANGE, // Actions geaendert + SC_CTM_PARENT // war kein Parent und ist jetzt einer }; struct ScChangeTrackMsgInfo { DECL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo ) - ScChangeTrackMsgType eMsgType; - ULONG nStartAction; - ULONG nEndAction; + ScChangeTrackMsgType eMsgType; + ULONG nStartAction; + ULONG nEndAction; }; // MsgQueue fuer Benachrichtigung via ModifiedLink @@ -989,7 +989,7 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* ) // Intern generierte Actions beginnen bei diesem Wert (fast alle Bits gesetzt) // und werden runtergezaehlt, um sich in einer Table wertemaessig nicht mit den // "normalen" Actions in die Quere zu kommen. -#define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) +#define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) class ScChangeTrack : public utl::ConfigurationListener { @@ -999,117 +999,117 @@ class ScChangeTrack : public utl::ConfigurationListener friend void ScChangeActionMove::DeleteCellEntries(); friend BOOL ScChangeActionMove::Reject( ScDocument* pDoc ); - static const SCROW nContentRowsPerSlot; - static const SCSIZE nContentSlots; - - com::sun::star::uno::Sequence< sal_Int8 > aProtectPass; - ScChangeActionTable aTable; - ScChangeActionTable aGeneratedTable; - ScChangeActionTable aPasteCutTable; - ScChangeTrackMsgQueue aMsgQueue; - ScChangeTrackMsgStack aMsgStackTmp; - ScChangeTrackMsgStack aMsgStackFinal; - ScStrCollection aUserCollection; - String aUser; - Link aModifiedLink; - ScRange aInDeleteRange; - DateTime aFixDateTime; - ScChangeAction* pFirst; - ScChangeAction* pLast; - ScChangeActionContent* pFirstGeneratedDelContent; - ScChangeActionContent** ppContentSlots; - ScChangeActionMove* pLastCutMove; - ScChangeActionLinkEntry* pLinkInsertCol; - ScChangeActionLinkEntry* pLinkInsertRow; - ScChangeActionLinkEntry* pLinkInsertTab; - ScChangeActionLinkEntry* pLinkMove; - ScChangeTrackMsgInfo* pBlockModifyMsg; - ScDocument* pDoc; - ULONG nActionMax; - ULONG nGeneratedMin; - ULONG nMarkLastSaved; - ULONG nStartLastCut; - ULONG nEndLastCut; - ULONG nLastMerge; - ScChangeTrackMergeState eMergeState; - USHORT nLoadedFileFormatVersion; - BOOL bLoadSave; - BOOL bInDelete; - BOOL bInDeleteUndo; - BOOL bInDeleteTop; - BOOL bInPasteCut; - BOOL bUseFixDateTime; + static const SCROW nContentRowsPerSlot; + static const SCSIZE nContentSlots; + + com::sun::star::uno::Sequence< sal_Int8 > aProtectPass; + ScChangeActionTable aTable; + ScChangeActionTable aGeneratedTable; + ScChangeActionTable aPasteCutTable; + ScChangeTrackMsgQueue aMsgQueue; + ScChangeTrackMsgStack aMsgStackTmp; + ScChangeTrackMsgStack aMsgStackFinal; + ScStrCollection aUserCollection; + String aUser; + Link aModifiedLink; + ScRange aInDeleteRange; + DateTime aFixDateTime; + ScChangeAction* pFirst; + ScChangeAction* pLast; + ScChangeActionContent* pFirstGeneratedDelContent; + ScChangeActionContent** ppContentSlots; + ScChangeActionMove* pLastCutMove; + ScChangeActionLinkEntry* pLinkInsertCol; + ScChangeActionLinkEntry* pLinkInsertRow; + ScChangeActionLinkEntry* pLinkInsertTab; + ScChangeActionLinkEntry* pLinkMove; + ScChangeTrackMsgInfo* pBlockModifyMsg; + ScDocument* pDoc; + ULONG nActionMax; + ULONG nGeneratedMin; + ULONG nMarkLastSaved; + ULONG nStartLastCut; + ULONG nEndLastCut; + ULONG nLastMerge; + ScChangeTrackMergeState eMergeState; + USHORT nLoadedFileFormatVersion; + BOOL bLoadSave; + BOOL bInDelete; + BOOL bInDeleteUndo; + BOOL bInDeleteTop; + BOOL bInPasteCut; + BOOL bUseFixDateTime; BOOL bTime100thSeconds; // not implemented, prevent usage ScChangeTrack( const ScChangeTrack& ); - ScChangeTrack& operator=( const ScChangeTrack& ); + ScChangeTrack& operator=( const ScChangeTrack& ); #ifdef SC_CHGTRACK_CXX - static SCROW InitContentRowsPerSlot(); + static SCROW InitContentRowsPerSlot(); // TRUE if one is MM_FORMULA and the other is // not, or if both are and range differs - static BOOL IsMatrixFormulaRangeDifferent( + static BOOL IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell, const ScBaseCell* pNewCell ); - void Init(); - void DtorClear(); - void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } - void SetInDeleteRange( const ScRange& rRange ) + void Init(); + void DtorClear(); + void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } + void SetInDeleteRange( const ScRange& rRange ) { aInDeleteRange = rRange; } - void SetInDelete( BOOL bVal ) + void SetInDelete( BOOL bVal ) { bInDelete = bVal; } - void SetInDeleteTop( BOOL bVal ) + void SetInDeleteTop( BOOL bVal ) { bInDeleteTop = bVal; } - void SetInDeleteUndo( BOOL bVal ) + void SetInDeleteUndo( BOOL bVal ) { bInDeleteUndo = bVal; } - void SetInPasteCut( BOOL bVal ) + void SetInPasteCut( BOOL bVal ) { bInPasteCut = bVal; } - void SetMergeState( ScChangeTrackMergeState eState ) + void SetMergeState( ScChangeTrackMergeState eState ) { eMergeState = eState; } - ScChangeTrackMergeState GetMergeState() const { return eMergeState; } - void SetLastMerge( ULONG nVal ) { nLastMerge = nVal; } - ULONG GetLastMerge() const { return nLastMerge; } + ScChangeTrackMergeState GetMergeState() const { return eMergeState; } + void SetLastMerge( ULONG nVal ) { nLastMerge = nVal; } + ULONG GetLastMerge() const { return nLastMerge; } - void SetLastCutMoveRange( const ScRange&, ScDocument* ); + void SetLastCutMoveRange( const ScRange&, ScDocument* ); // ModifyMsg blockweise und nicht einzeln erzeugen - void StartBlockModify( ScChangeTrackMsgType, + void StartBlockModify( ScChangeTrackMsgType, ULONG nStartAction ); - void EndBlockModify( ULONG nEndAction ); + void EndBlockModify( ULONG nEndAction ); - void AddDependentWithNotify( ScChangeAction* pParent, + void AddDependentWithNotify( ScChangeAction* pParent, ScChangeAction* pDependent ); - void Dependencies( ScChangeAction* ); - void UpdateReference( ScChangeAction*, BOOL bUndo ); - void UpdateReference( ScChangeAction** ppFirstAction, + void Dependencies( ScChangeAction* ); + void UpdateReference( ScChangeAction*, BOOL bUndo ); + void UpdateReference( ScChangeAction** ppFirstAction, ScChangeAction* pAct, BOOL bUndo ); - void Append( ScChangeAction* pAppend, ULONG nAction ); - SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, + void Append( ScChangeAction* pAppend, ULONG nAction ); + SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, SCsTAB nDz, ULONG nRejectingInsert ); - void AppendOneDeleteRange( const ScRange& rOrgRange, + void AppendOneDeleteRange( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ULONG nRejectingInsert ); - void LookUpContents( const ScRange& rOrgRange, + void LookUpContents( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void Remove( ScChangeAction* ); - void MasterLinks( ScChangeAction* ); + void Remove( ScChangeAction* ); + void MasterLinks( ScChangeAction* ); // Content on top an Position - ScChangeActionContent* SearchContentAt( const ScBigAddress&, + ScChangeActionContent* SearchContentAt( const ScBigAddress&, ScChangeAction* pButNotThis ) const; - void DeleteGeneratedDelContent( + void DeleteGeneratedDelContent( ScChangeActionContent* ); - ScChangeActionContent* GenerateDelContent( const ScAddress&, + ScChangeActionContent* GenerateDelContent( const ScAddress&, const ScBaseCell*, const ScDocument* pFromDoc ); - void DeleteCellEntries( + void DeleteCellEntries( ScChangeActionCellListEntry*&, ScChangeAction* pDeletor ); @@ -1118,17 +1118,17 @@ class ScChangeTrack : public utl::ConfigurationListener // ist nur bei Insert und Move (MasterType) // noetig, kann ansonsten NULL sein. // bRecursion == Aufruf aus Reject mit Table - BOOL Reject( ScChangeAction*, + BOOL Reject( ScChangeAction*, ScChangeActionTable*, BOOL bRecursion ); -#endif // SC_CHGTRACK_CXX +#endif // SC_CHGTRACK_CXX - void ClearMsgQueue(); + void ClearMsgQueue(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: - static SCSIZE ComputeContentSlot( INT32 nRow ) + static SCSIZE ComputeContentSlot( INT32 nRow ) { if ( nRow < 0 || nRow > MAXROW ) return nContentSlots - 1; @@ -1139,64 +1139,64 @@ public: ScChangeTrack( ScDocument*, const ScStrCollection& ); // only to use in the XML import SC_DLLPUBLIC virtual ~ScChangeTrack(); - void Clear(); + void Clear(); - ScChangeActionContent* GetFirstGenerated() const { return pFirstGeneratedDelContent; } - ScChangeAction* GetFirst() const { return pFirst; } - ScChangeAction* GetLast() const { return pLast; } - ULONG GetActionMax() const { return nActionMax; } - BOOL IsGenerated( ULONG nAction ) const + ScChangeActionContent* GetFirstGenerated() const { return pFirstGeneratedDelContent; } + ScChangeAction* GetFirst() const { return pFirst; } + ScChangeAction* GetLast() const { return pLast; } + ULONG GetActionMax() const { return nActionMax; } + BOOL IsGenerated( ULONG nAction ) const { return nAction >= nGeneratedMin; } - ScChangeAction* GetAction( ULONG nAction ) const + ScChangeAction* GetAction( ULONG nAction ) const { return aTable.Get( nAction ); } - ScChangeAction* GetGenerated( ULONG nGenerated ) const + ScChangeAction* GetGenerated( ULONG nGenerated ) const { return aGeneratedTable.Get( nGenerated ); } - ScChangeAction* GetActionOrGenerated( ULONG nAction ) const + ScChangeAction* GetActionOrGenerated( ULONG nAction ) const { return IsGenerated( nAction ) ? GetGenerated( nAction ) : GetAction( nAction ); } - ULONG GetLastSavedActionNumber() const + ULONG GetLastSavedActionNumber() const { return nMarkLastSaved; } void SetLastSavedActionNumber(ULONG nNew) { nMarkLastSaved = nNew; } - ScChangeAction* GetLastSaved() const + ScChangeAction* GetLastSaved() const { return aTable.Get( nMarkLastSaved ); } - ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } + ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } - BOOL IsLoadSave() const { return bLoadSave; } - const ScRange& GetInDeleteRange() const + BOOL IsLoadSave() const { return bLoadSave; } + const ScRange& GetInDeleteRange() const { return aInDeleteRange; } - BOOL IsInDelete() const { return bInDelete; } - BOOL IsInDeleteTop() const { return bInDeleteTop; } - BOOL IsInDeleteUndo() const { return bInDeleteUndo; } - BOOL IsInPasteCut() const { return bInPasteCut; } - SC_DLLPUBLIC void SetUser( const String& ); - const String& GetUser() const { return aUser; } - const ScStrCollection& GetUserCollection() const + BOOL IsInDelete() const { return bInDelete; } + BOOL IsInDeleteTop() const { return bInDeleteTop; } + BOOL IsInDeleteUndo() const { return bInDeleteUndo; } + BOOL IsInPasteCut() const { return bInPasteCut; } + SC_DLLPUBLIC void SetUser( const String& ); + const String& GetUser() const { return aUser; } + const ScStrCollection& GetUserCollection() const { return aUserCollection; } - ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() const { return pDoc; } // for import filter - const DateTime& GetFixDateTime() const { return aFixDateTime; } + const DateTime& GetFixDateTime() const { return aFixDateTime; } // set this if the date/time set with // SetFixDateTime...() shall be applied to // appended actions - void SetUseFixDateTime( BOOL bVal ) + void SetUseFixDateTime( BOOL bVal ) { bUseFixDateTime = bVal; } // for MergeDocument, apply original date/time as UTC - void SetFixDateTimeUTC( const DateTime& rDT ) + void SetFixDateTimeUTC( const DateTime& rDT ) { aFixDateTime = rDT; } // for import filter, apply original date/time as local time - void SetFixDateTimeLocal( const DateTime& rDT ) + void SetFixDateTimeLocal( const DateTime& rDT ) { aFixDateTime = rDT; aFixDateTime.ConvertToUTC(); } - void Append( ScChangeAction* ); + void Append( ScChangeAction* ); // pRefDoc may be NULL => no lookup of contents // => no generation of deleted contents - SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, + SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction, SCsTAB nDz = 0 ); @@ -1205,28 +1205,28 @@ public: // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus RefDoc/UndoDoc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, ScDocument* pRefDoc ); // nachdem neue Werte im Dokument gesetzt wurden, // alte Werte aus RefDoc/UndoDoc - void AppendContentRange( const ScRange& rRange, + void AppendContentRange( const ScRange& rRange, ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction, ScChangeActionClipMode eMode = SC_CACM_NONE ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, nOldFormat, // RefDoc==NULL => Doc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell, ULONG nOldFormat, ScDocument* pRefDoc = NULL ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, Format aus Doc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell ); // nachdem neue Werte im Dokument gesetzt wurden, // alte Werte aus RefDoc/UndoDoc. // Alle Contents, wo im RefDoc eine Zelle steht. - void AppendContentsIfInRefDoc( ScDocument* pRefDoc, + void AppendContentsIfInRefDoc( ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction ); // Meant for import filter, creates and inserts @@ -1237,7 +1237,7 @@ public: // The action is returned and may be used to // set user name, description, date/time et al. // Takes ownership of the cells! - SC_DLLPUBLIC ScChangeActionContent* AppendContentOnTheFly( const ScAddress& rPos, + SC_DLLPUBLIC ScChangeActionContent* AppendContentOnTheFly( const ScAddress& rPos, ScBaseCell* pOldCell, ScBaseCell* pNewCell, ULONG nOldFormat = 0, @@ -1248,20 +1248,20 @@ public: // NewValue bzw. Formelerzeugung) // bevor neuer Wert im Dokument gesetzt wird - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const String& rNewValue, ScBaseCell* pOldCell ); - SC_DLLPUBLIC void AppendInsert( const ScRange& ); + SC_DLLPUBLIC void AppendInsert( const ScRange& ); // pRefDoc may be NULL => no lookup of contents // => no generation of deleted contents - SC_DLLPUBLIC void AppendMove( const ScRange& rFromRange, + SC_DLLPUBLIC void AppendMove( const ScRange& rFromRange, const ScRange& rToRange, ScDocument* pRefDoc ); // Cut to Clipboard - void ResetLastCut() + void ResetLastCut() { nStartLastCut = nEndLastCut = 0; if ( pLastCutMove ) @@ -1270,22 +1270,22 @@ public: pLastCutMove = NULL; } } - BOOL HasLastCut() const + BOOL HasLastCut() const { return nEndLastCut > 0 && nStartLastCut <= nEndLastCut && pLastCutMove; } - SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false ); + SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false ); // fuer MergeDocument, Referenzen anpassen, //! darf nur in einem temporaer geoeffneten //! Dokument verwendet werden, der Track //! ist danach verhunzt - void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false ); - void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false ); - static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge ); + void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false ); + void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false ); + static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge ); // Abhaengige in Table einfuegen. // Bei Insert sind es echte Abhaengige, @@ -1300,7 +1300,7 @@ public: // Deletes einer Reihe gelistet. // Mit bAllFlat werden auch alle Abhaengigen // der Abhaengigen flach eingefuegt. - SC_DLLPUBLIC void GetDependents( ScChangeAction*, + SC_DLLPUBLIC void GetDependents( ScChangeAction*, ScChangeActionTable&, BOOL bListMasterDelete = FALSE, BOOL bAllFlat = FALSE ) const; @@ -1309,36 +1309,36 @@ public: BOOL Reject( ScChangeAction*, bool bShared = false ); // Accept visible Action (und abhaengige) - SC_DLLPUBLIC BOOL Accept( ScChangeAction* ); + SC_DLLPUBLIC BOOL Accept( ScChangeAction* ); - void AcceptAll(); // alle Virgins - BOOL RejectAll(); // alle Virgins + void AcceptAll(); // alle Virgins + BOOL RejectAll(); // alle Virgins // Selektiert einen Content von mehreren an // gleicher Position und akzeptiert diesen und // die aelteren, rejected die neueren. // Mit bOldest==TRUE wird der erste OldValue // einer Virgin-Content-Kette restauriert. - BOOL SelectContent( ScChangeAction*, + BOOL SelectContent( ScChangeAction*, BOOL bOldest = FALSE ); // wenn ModifiedLink gesetzt, landen // Aenderungen in ScChangeTrackMsgQueue - void SetModifiedLink( const Link& r ) + void SetModifiedLink( const Link& r ) { aModifiedLink = r; ClearMsgQueue(); } - const Link& GetModifiedLink() const { return aModifiedLink; } + const Link& GetModifiedLink() const { return aModifiedLink; } ScChangeTrackMsgQueue& GetMsgQueue() { return aMsgQueue; } - void NotifyModified( ScChangeTrackMsgType eMsgType, + void NotifyModified( ScChangeTrackMsgType eMsgType, ULONG nStartAction, ULONG nEndAction ); - USHORT GetLoadedFileFormatVersion() const + USHORT GetLoadedFileFormatVersion() const { return nLoadedFileFormatVersion; } - ULONG AddLoadedGenerated(ScBaseCell* pOldCell, + ULONG AddLoadedGenerated(ScBaseCell* pOldCell, const ScBigRange& aBigRange, const String& sNewValue ); // only to use in the XML import - void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected - void SetActionMax(ULONG nTempActionMax) + void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected + void SetActionMax(ULONG nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import void SetProtection( const com::sun::star::uno::Sequence< sal_Int8 >& rPass ) diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index ddc0dcc14243..05adba0b7b20 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -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,7 +32,7 @@ #include "rangelst.hxx" #include "scdllapi.h" -enum ScChgsDateMode{ SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2, +enum ScChgsDateMode{ SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2, SCDM_DATE_NOTEQUAL=3,SCDM_DATE_BETWEEN=4, SCDM_DATE_SAVE=5, SCDM_NO_DATEMODE=6}; @@ -46,21 +46,21 @@ class SC_DLLPUBLIC ScChangeViewSettings { private: - utl::TextSearch* pCommentSearcher; - DateTime aFirstDateTime; - DateTime aLastDateTime; - String aAuthorToShow; - String aComment; - ScRangeList aRangeList; - ScChgsDateMode eDateMode; - BOOL bShowIt; - BOOL bIsDate; - BOOL bIsAuthor; - BOOL bIsComment; - BOOL bIsRange; - BOOL bEveryoneButMe; - BOOL bShowAccepted; - BOOL bShowRejected; + utl::TextSearch* pCommentSearcher; + DateTime aFirstDateTime; + DateTime aLastDateTime; + String aAuthorToShow; + String aComment; + ScRangeList aRangeList; + ScChgsDateMode eDateMode; + BOOL bShowIt; + BOOL bIsDate; + BOOL bIsAuthor; + BOOL bIsComment; + BOOL bIsRange; + BOOL bEveryoneButMe; + BOOL bShowAccepted; + BOOL bShowRejected; bool mbIsActionRange; ULONG mnFirstAction; ULONG mnLastAction; @@ -86,53 +86,53 @@ public: ~ScChangeViewSettings(); - BOOL ShowChanges() const {return bShowIt;} - void SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;} + BOOL ShowChanges() const {return bShowIt;} + void SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;} - BOOL HasDate() const {return bIsDate;} - void SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;} + BOOL HasDate() const {return bIsDate;} + void SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;} - void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } - ScChgsDateMode GetTheDateMode() const { return eDateMode; } + void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } + ScChgsDateMode GetTheDateMode() const { return eDateMode; } - void SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;} - const DateTime& GetTheFirstDateTime()const {return aFirstDateTime;} + void SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;} + const DateTime& GetTheFirstDateTime()const {return aFirstDateTime;} - void SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;} - const DateTime& GetTheLastDateTime()const {return aLastDateTime;} + void SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;} + const DateTime& GetTheLastDateTime()const {return aLastDateTime;} - BOOL HasAuthor() const {return bIsAuthor;} - void SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;} + BOOL HasAuthor() const {return bIsAuthor;} + void SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;} - String GetTheAuthorToShow()const {return aAuthorToShow;} - void SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;} + String GetTheAuthorToShow()const {return aAuthorToShow;} + void SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;} - BOOL HasComment() const {return bIsComment;} - void SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;} + BOOL HasComment() const {return bIsComment;} + void SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;} - String GetTheComment()const {return aComment;} - void SetTheComment(const String& aString); + String GetTheComment()const {return aComment;} + void SetTheComment(const String& aString); - BOOL IsValidComment(const String* pCommentStr) const; + BOOL IsValidComment(const String* pCommentStr) const; - BOOL IsEveryoneButMe() const {return bEveryoneButMe;} - void SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;} + BOOL IsEveryoneButMe() const {return bEveryoneButMe;} + void SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;} - BOOL HasRange() const {return bIsRange;} - void SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;} + BOOL HasRange() const {return bIsRange;} + void SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;} - const ScRangeList& GetTheRangeList()const {return aRangeList;} - void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} + const ScRangeList& GetTheRangeList()const {return aRangeList;} + void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} - BOOL IsShowAccepted() const { return bShowAccepted; } - void SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; } + BOOL IsShowAccepted() const { return bShowAccepted; } + void SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; } - BOOL IsShowRejected() const { return bShowRejected; } - void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } + BOOL IsShowRejected() const { return bShowRejected; } + void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } - ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); + ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); /// Adjust dates according to selected DateMode void AdjustDateMode( const ScDocument& rDoc ); diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index 78b5474229d1..0bb0fa44a66f 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -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 @@ -33,8 +33,8 @@ #include -/** - * This struct stores general clipboard parameters associated with a +/** + * This struct stores general clipboard parameters associated with a * ScDocument instance created in clipboard mode. */ struct ScClipParam @@ -51,20 +51,20 @@ struct ScClipParam bool isMultiRange() const; - /** + /** * Get the column size of a pasted range. Note that when the range is - * non-contiguous, we first compress all individual ranges into a single + * non-contiguous, we first compress all individual ranges into a single * range, and the size of that compressed range is returned. */ SCCOL getPasteColSize(); - /** - * Same as the above method, but returns the row size of the compressed - * range. + /** + * Same as the above method, but returns the row size of the compressed + * range. */ SCROW getPasteRowSize(); - /** + /** * Return a single range that encompasses all individual ranges. */ ScRange getWholeRange() const; diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index 167ab5929c6a..b38aeb24c77d 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -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 @@ -37,12 +37,12 @@ #endif #include "scdllapi.h" -#define MAXCOLLECTIONSIZE 16384 -#define MAXDELTA 1024 -#define SCPOS_INVALID USHRT_MAX +#define MAXCOLLECTIONSIZE 16384 +#define MAXDELTA 1024 +#define SCPOS_INVALID USHRT_MAX -#define SC_STRTYPE_VALUE 0 -#define SC_STRTYPE_STANDARD 1 +#define SC_STRTYPE_VALUE 0 +#define SC_STRTYPE_STANDARD 1 class ScDocument; @@ -57,10 +57,10 @@ public: class SC_DLLPUBLIC ScCollection : public ScDataObject { protected: - USHORT nCount; - USHORT nLimit; - USHORT nDelta; - ScDataObject** pItems; + USHORT nCount; + USHORT nLimit; + USHORT nDelta; + ScDataObject** pItems; public: ScCollection(USHORT nLim = 4, USHORT nDel = 4); ScCollection(const ScCollection& rCollection); @@ -87,11 +87,11 @@ public: class SC_DLLPUBLIC ScSortedCollection : public ScCollection { private: - BOOL bDuplicates; + BOOL bDuplicates; protected: // fuer ScStrCollection Load/Store - void SetDups( BOOL bVal ) { bDuplicates = bVal; } - BOOL IsDups() const { return bDuplicates; } + void SetDups( BOOL bVal ) { bDuplicates = bVal; } + BOOL IsDups() const { return bDuplicates; } public: ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE); ScSortedCollection(const ScSortedCollection& rScSortedCollection) : @@ -118,11 +118,11 @@ friend class ScStrCollection; public: StrData(const String& rStr) : aStr(rStr) {} StrData(const StrData& rData) : ScDataObject(), aStr(rData.aStr) {} - virtual ScDataObject* Clone() const; - const String& GetString() const { return aStr; } + virtual ScDataObject* Clone() const; + const String& GetString() const { return aStr; } // SetString nur, wenn StrData nicht in ScStrCollection ist! !!! // z.B. fuer Searcher - void SetString( const String& rNew ) { aStr = rNew; } + void SetString( const String& rNew ) { aStr = rNew; } }; //------------------------------------------------------------------------ @@ -133,23 +133,23 @@ class SC_DLLPUBLIC ScStrCollection : public ScSortedCollection { public: ScStrCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : - ScSortedCollection ( nLim, nDel, bDup ) {} + ScSortedCollection ( nLim, nDel, bDup ) {} ScStrCollection(const ScStrCollection& rScStrCollection) : - ScSortedCollection ( rScStrCollection ) {} + ScSortedCollection ( rScStrCollection ) {} - virtual ScDataObject* Clone() const; - StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual ScDataObject* Clone() const; + StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; }; //------------------------------------------------------------------------ // TypedScStrCollection: wie ScStrCollection, nur, dass Zahlen vor Strings -// sortiert werden +// sortiert werden class TypedStrData : public ScDataObject { public: - TypedStrData( const String& rStr, double nVal = 0.0, + TypedStrData( const String& rStr, double nVal = 0.0, USHORT nType = SC_STRTYPE_STANDARD ) : aStrValue(rStr), nValue(nVal), @@ -164,24 +164,24 @@ public: nValue(rCpy.nValue), nStrType(rCpy.nStrType) {} - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL IsStrData() const { return nStrType != 0; } - const String& GetString() const { return aStrValue; } - double GetValue () const { return nValue; } + BOOL IsStrData() const { return nStrType != 0; } + const String& GetString() const { return aStrValue; } + double GetValue () const { return nValue; } private: friend class TypedScStrCollection; - String aStrValue; - double nValue; - USHORT nStrType; // 0 = Value + String aStrValue; + double nValue; + USHORT nStrType; // 0 = Value }; class SC_DLLPUBLIC TypedScStrCollection : public ScSortedCollection { private: - BOOL bCaseSensitive; + BOOL bCaseSensitive; public: TypedScStrCollection( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE ); @@ -193,9 +193,9 @@ public: virtual ScDataObject* Clone() const; virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const; - TypedStrData* operator[]( const USHORT nIndex) const; + TypedStrData* operator[]( const USHORT nIndex) const; - void SetCaseSensitive( BOOL bSet ); + void SetCaseSensitive( BOOL bSet ); BOOL FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const; BOOL GetExactMatch( String& rString ) const; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index af6292bbd830..5c149ccede32 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -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,16 +66,16 @@ struct ScLineFlags; struct ScMergePatternState; class ScFlatBoolRowSegments; -#define COLUMN_DELTA 4 +#define COLUMN_DELTA 4 struct ScNeededSizeOptions { - const ScPatternAttr* pPattern; - BOOL bFormula; - BOOL bSkipMerged; - BOOL bGetFont; - BOOL bTotalSize; + const ScPatternAttr* pPattern; + BOOL bFormula; + BOOL bSkipMerged; + BOOL bGetFont; + BOOL bTotalSize; ScNeededSizeOptions() { @@ -89,25 +89,25 @@ struct ScNeededSizeOptions struct ColEntry { - SCROW nRow; - ScBaseCell* pCell; + SCROW nRow; + ScBaseCell* pCell; }; class ScColumn { private: - SCCOL nCol; - SCTAB nTab; + SCCOL nCol; + SCTAB nTab; - SCSIZE nCount; - SCSIZE nLimit; - ColEntry* pItems; + SCSIZE nCount; + SCSIZE nLimit; + ColEntry* pItems; - ScAttrArray* pAttrArray; - ScDocument* pDocument; + ScAttrArray* pAttrArray; + ScDocument* pDocument; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator; friend class ScDBQueryDataIterator; @@ -119,142 +119,142 @@ friend class ScHorizontalCellIterator; friend class ScHorizontalAttrIterator; public: -static BOOL bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln +static BOOL bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln public: ScColumn(); ~ScColumn(); - void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); - - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; - ScBaseCell* GetCell( SCROW nRow ) const; - void Insert( SCROW nRow, ScBaseCell* pCell ); - void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell ); - void Append( SCROW nRow, ScBaseCell* pCell ); - void Delete( SCROW nRow ); - void DeleteAtIndex( SCSIZE nIndex ); - void FreeAll(); - void Resize( SCSIZE nSize ); - void SwapRow( SCROW nRow1, SCROW nRow2 ); - void SwapCell( SCROW nRow, ScColumn& rCol); - -//UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, -//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; + void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); + + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + ScBaseCell* GetCell( SCROW nRow ) const; + void Insert( SCROW nRow, ScBaseCell* pCell ); + void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell ); + void Append( SCROW nRow, ScBaseCell* pCell ); + void Delete( SCROW nRow ); + void DeleteAtIndex( SCSIZE nIndex ); + void FreeAll(); + void Resize( SCSIZE nSize ); + void SwapRow( SCROW nRow1, SCROW nRow2 ); + void SwapCell( SCROW nRow, ScColumn& rCol); + +//UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, +//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, + BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; + BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, BOOL bRefresh, BOOL bAttrs ); - BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster - BOOL IsEmptyData() const; - BOOL IsEmptyAttr() const; - BOOL IsEmpty() const; + BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster + BOOL IsEmptyData() const; + BOOL IsEmptyAttr() const; + BOOL IsEmpty() const; // nur Daten: - BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; - SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; - BOOL HasDataAt(SCROW nRow) const; - BOOL HasVisibleDataAt(SCROW nRow) const; - SCROW GetFirstDataPos() const; - SCROW GetLastDataPos() const; - SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster - SCROW GetFirstVisDataPos(BOOL bNotes) const; - BOOL GetPrevDataPos(SCROW& rRow) const; - BOOL GetNextDataPos(SCROW& rRow) const; - void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster) - void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const; - - SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; - - USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; + BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; + SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; + BOOL HasDataAt(SCROW nRow) const; + BOOL HasVisibleDataAt(SCROW nRow) const; + SCROW GetFirstDataPos() const; + SCROW GetLastDataPos() const; + SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster + SCROW GetFirstVisDataPos(BOOL bNotes) const; + BOOL GetPrevDataPos(SCROW& rRow) const; + BOOL GetNextDataPos(SCROW& rRow) const; + void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster) + void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const; + + SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; + + USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; + BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, + BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, SCROW nEndRow = MAXROW ) const; - BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; - void InsertRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCROW nStartRow, SCSIZE nSize ); + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + BOOL TestInsertRow( SCSIZE nSize ) const; + void InsertRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCROW nStartRow, SCSIZE nSize ); void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag ); void DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag ); void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); - void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, + void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn); - void StartListeningInArea( SCROW nRow1, SCROW nRow2 ); - void BroadcastInArea( SCROW nRow1, SCROW nRow2 ); + void StartListeningInArea( SCROW nRow1, SCROW nRow2 ); + void BroadcastInArea( SCROW nRow1, SCROW nRow2 ); - void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ); + void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ); - // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, + // Markierung von diesem Dokument + void MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScColumn& rSrcCol ); - void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, + void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, ScColumn& rSrcCol ); - ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos, + ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos, SCSIZE nIndex, USHORT nFlags ) const; ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const; - SCCOL GetCol() const { return nCol; } + SCCOL GetCol() const { return nCol; } - // UpdateSelectionFunction: Mehrfachselektion - void UpdateSelectionFunction( const ScMarkData& rMark, + // UpdateSelectionFunction: Mehrfachselektion + void UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow ); - void UpdateAreaFunction( ScFunctionData& rData, + void UpdateAreaFunction( ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow ); - void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL, BOOL bAsLink = FALSE ); - void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL ); - void CopyScenarioFrom( const ScColumn& rSrcCol ); - void CopyScenarioTo( ScColumn& rDestCol ) const; - BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const; - void MarkScenarioIn( ScMarkData& rDestMark ) const; + void CopyScenarioFrom( const ScColumn& rSrcCol ); + void CopyScenarioTo( ScColumn& rDestCol ) const; + BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const; + void MarkScenarioIn( ScMarkData& rDestMark ) const; - void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const; + void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const; - void SwapCol(ScColumn& rCol); - void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol); + void SwapCol(ScColumn& rCol); + void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol); - BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; + BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; - // TRUE = Zahlformat gesetzt - BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, + // TRUE = Zahlformat gesetzt + BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); - void SetValue( SCROW nRow, const double& rVal); - void SetError( SCROW nRow, const USHORT nError); + void SetValue( SCROW nRow, const double& rVal); + void SetError( SCROW nRow, const USHORT nError); - void GetString( SCROW nRow, String& rString ) const; - void GetInputString( SCROW nRow, String& rString ) const; - double GetValue( SCROW nRow ) const; - void GetFormula( SCROW nRow, String& rFormula, + void GetString( SCROW nRow, String& rString ) const; + void GetInputString( SCROW nRow, String& rString ) const; + double GetValue( SCROW nRow ) const; + void GetFormula( SCROW nRow, String& rFormula, BOOL bAsciiExport = FALSE ) const; - CellType GetCellType( SCROW nRow ) const; - SCSIZE GetCellCount() const { return nCount; } - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln - USHORT GetErrCode( SCROW nRow ) const; + CellType GetCellType( SCROW nRow ) const; + SCSIZE GetCellCount() const { return nCount; } + ULONG GetWeightedCount() const; + ULONG GetCodeCount() const; // RPN-Code in Formeln + USHORT GetErrCode( SCROW nRow ) const; - BOOL HasStringData( SCROW nRow ) const; - BOOL HasValueData( SCROW nRow ) const; -//UNUSED2009-05 USHORT GetErrorData( SCROW nRow) const; - BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; + BOOL HasStringData( SCROW nRow ) const; + BOOL HasValueData( SCROW nRow ) const; +//UNUSED2009-05 USHORT GetErrorData( SCROW nRow) const; + BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; /** Returns the pointer to a cell note object at the passed row. */ ScPostIt* GetNote( SCROW nRow ); @@ -265,176 +265,176 @@ public: /** Deletes the note at the passed row. */ void DeleteNote( SCROW nRow ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetDirtyVar(); - void SetDirtyAfterLoad(); - void SetTableOpDirty( const ScRange& ); - void CalcAll(); - void CalcAfterLoad(); - void CompileAll(); - void CompileXML( ScProgress& rProgress ); + void SetDirty(); + void SetDirty( const ScRange& ); + void SetDirtyVar(); + void SetDirtyAfterLoad(); + void SetTableOpDirty( const ScRange& ); + void CalcAll(); + void CalcAfterLoad(); + void CompileAll(); + void CompileXML( ScProgress& rProgress ); - void ResetChanged( SCROW nStartRow, SCROW nEndRow ); + void ResetChanged( SCROW nStartRow, SCROW nEndRow ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL ); - void UpdateInsertTab( SCTAB nTable); - void UpdateInsertTabOnlyCells( SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL ); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void UpdateInsertTab( SCTAB nTable); + void UpdateInsertTabOnlyCells( SCTAB nTable); + void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL ); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const; + void SetTabNo(SCTAB nNewTab); + BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const; void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set& rIndexes) const; - void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); + void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); - const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const; - const ScPatternAttr* GetPattern( SCROW nRow ) const; + const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const; + const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( SCROW nRow ) const; + ULONG GetNumberFormat( SCROW nRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; + void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); - void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); - void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr ); - void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, + void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); + void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr ); + void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); - void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, + void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ); - void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ); - void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ); + void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ); + void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; + const ScStyleSheet* GetStyle( SCROW nRow ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; + const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; - void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; /// May return -1 if not found - SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, + SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); + BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); - void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); + void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); - SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); + SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - long GetNeededSize( SCROW nRow, OutputDevice* pDev, + long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, const ScNeededSizeOptions& rOptions ); - USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, + USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, USHORT nOldWidth, const ScMarkData* pMarkData, BOOL bSimpleTextImport ); - void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, + void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bShrink, USHORT nMinHeight, SCROW nMinStart ); private: - long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, + long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, BOOL bWidth ); public: /// Including current, may return -1 - SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; - void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); - BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); + BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); -//UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; +//UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; - void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL TestTabRefAbs(SCTAB nTable); - BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; + void UpdateInsertTabAbs(SCTAB nNewPos); + BOOL TestTabRefAbs(SCTAB nTable); + BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; - void RemoveAutoSpellObj(); + void RemoveAutoSpellObj(); - void StartListening( SvtListener& rLst, SCROW nRow ); - void EndListening( SvtListener& rLst, SCROW nRow ); - void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ); - void StartAllListeners(); + void StartListening( SvtListener& rLst, SCROW nRow ); + void EndListening( SvtListener& rLst, SCROW nRow ); + void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ); + void StartAllListeners(); void StartNeededListeners(); // only for cells where NeedsListening()==TRUE - void SetRelNameDirty(); + void SetRelNameDirty(); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); - sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; + sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision, SCROW nRowStart, SCROW nRowEnd ) const; private: ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos); -//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet ); +//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet ); }; -class ScColumnIterator // alle Daten eines Bereichs durchgehen +class ScColumnIterator // alle Daten eines Bereichs durchgehen { - const ScColumn* pColumn; - SCSIZE nPos; - SCROW nTop; - SCROW nBottom; + const ScColumn* pColumn; + SCSIZE nPos; + SCROW nTop; + SCROW nBottom; public: ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW ); ~ScColumnIterator(); - BOOL Next( SCROW& rRow, ScBaseCell*& rpCell ); - SCSIZE GetIndex() const; + BOOL Next( SCROW& rRow, ScBaseCell*& rpCell ); + SCSIZE GetIndex() const; }; -class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen +class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen { - const ScColumn* pColumn; - SCSIZE nPos; - ScMarkArrayIter* pMarkIter; - SCROW nTop; - SCROW nBottom; - BOOL bNext; - BOOL bAll; + const ScColumn* pColumn; + SCSIZE nPos; + ScMarkArrayIter* pMarkIter; + SCROW nTop; + SCROW nBottom; + BOOL bNext; + BOOL bAll; public: ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData, BOOL bAllIfNone = FALSE ); ~ScMarkedDataIter(); - BOOL Next( SCSIZE& rIndex ); + BOOL Next( SCSIZE& rIndex ); }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 7d045db3c2aa..f13718206d7d 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -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 @@ -420,7 +420,7 @@ public: const ScAddress& GetPos() const { return aPos; } void MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow ); - static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, + static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow ); BOOL UpdateNameReference( UpdateRefMode eUpdateRefMode, @@ -445,7 +445,7 @@ public: BOOL HasModifiedRange(); - /** If the character is allowed as first character in sheet names or + /** If the character is allowed as first character in sheet names or references, includes '$' and '?'. */ static inline BOOL IsCharWordChar( String const & rStr, xub_StrLen nPos, @@ -462,7 +462,7 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed in sheet names, thus may be part of a + /** If the character is allowed in sheet names, thus may be part of a reference, includes '$' and '?' and such. */ static inline BOOL IsWordChar( String const & rStr, xub_StrLen nPos, @@ -479,11 +479,11 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... - bits) for all known address conventions. If more than one bit is given - in nFlags, all bits must match. If bTestLetterNumeric is FALSE and + /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... + bits) for all known address conventions. If more than one bit is given + in nFlags, all bits must match. If bTestLetterNumeric is FALSE and char>=128, no LetterNumeric test is done and FALSE is returned. */ - static inline bool IsCharFlagAllConventions( String const & rStr, + static inline bool IsCharFlagAllConventions( String const & rStr, xub_StrLen nPos, ULONG nFlags, bool bTestLetterNumeric = true ) @@ -494,7 +494,7 @@ public: for ( int nConv = formula::FormulaGrammar::CONV_UNSPECIFIED; ++nConv < formula::FormulaGrammar::CONV_LAST; ) { - if (pConventions[nConv] && + if (pConventions[nConv] && ((pConventions[nConv]->mpCharTable[ UINT8(c) ] & nFlags) != nFlags)) return false; // convention not known => assume valid @@ -526,7 +526,7 @@ private: virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name + virtual void LocalizeString( String& rName ); // modify rName - input: exact name virtual BOOL IsImportingXML() const; /// Access the CharTable flags diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index 3b6f35366976..d80e65dd06b6 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -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 @@ -306,7 +306,7 @@ A ScCompressedArrayIterator::GetIterEnd() const return nIterEnd; } - + template< typename A, typename D > bool ScCompressedArrayIterator::operator++() { diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 75758841af7a..575090bd0cfd 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -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 @@ -42,8 +42,8 @@ class ScRangeList; #define SC_COND_GROW 16 -// nOptions Flags -#define SC_COND_NOBLANKS 1 +// nOptions Flags +#define SC_COND_NOBLANKS 1 // Reihenfolge von ScConditionMode wie ScQueryOp, @@ -73,40 +73,40 @@ enum ScConditionValType class SC_DLLPUBLIC ScConditionEntry { // gespeicherte Daten: - ScConditionMode eOp; - USHORT nOptions; - double nVal1; // eingegeben oder berechnet - double nVal2; - String aStrVal1; // eingegeben oder berechnet - String aStrVal2; + ScConditionMode eOp; + USHORT nOptions; + double nVal1; // eingegeben oder berechnet + double nVal2; + String aStrVal1; // eingegeben oder berechnet + String aStrVal2; String aStrNmsp1; // namespace to be used on (re)compilation, e.g. in XML import String aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar1; // grammar to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar2; // grammar to be used on (re)compilation, e.g. in XML import - BOOL bIsStr1; // um auch leere Strings zu erkennen - BOOL bIsStr2; - ScTokenArray* pFormula1; // eingegebene Formel - ScTokenArray* pFormula2; + BOOL bIsStr1; // um auch leere Strings zu erkennen + BOOL bIsStr2; + ScTokenArray* pFormula1; // eingegebene Formel + ScTokenArray* pFormula2; ScAddress aSrcPos; // source position for formulas // temporary data: String aSrcString; // formula source position as text during XML import - ScFormulaCell* pFCell1; - ScFormulaCell* pFCell2; - ScDocument* pDoc; - BOOL bRelRef1; - BOOL bRelRef2; - BOOL bFirstRun; - - void MakeCells( const ScAddress& rPos ); - void Compile( const String& rExpr1, const String& rExpr2, + ScFormulaCell* pFCell1; + ScFormulaCell* pFCell2; + ScDocument* pDoc; + BOOL bRelRef1; + BOOL bRelRef2; + BOOL bFirstRun; + + void MakeCells( const ScAddress& rPos ); + void Compile( const String& rExpr1, const String& rExpr2, const String& rExprNmsp1, const String& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2, BOOL bTextToReal ); - void Interpret( const ScAddress& rPos ); + void Interpret( const ScAddress& rPos ); - BOOL IsValid( double nArg ) const; - BOOL IsValidStr( const String& rArg ) const; + BOOL IsValid( double nArg ) const; + BOOL IsValidStr( const String& rArg ) const; public: ScConditionEntry( ScConditionMode eOper, @@ -118,19 +118,19 @@ public: ScConditionEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos ); - ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln + ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln // echte Kopie der Formeln (fuer Ref-Undo): ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r ); virtual ~ScConditionEntry(); - int operator== ( const ScConditionEntry& r ) const; + int operator== ( const ScConditionEntry& r ) const; - BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; - ScConditionMode GetOperation() const { return eOp; } - BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } - void SetIgnoreBlank(BOOL bSet); - ScAddress GetSrcPos() const { return aSrcPos; } + ScConditionMode GetOperation() const { return eOp; } + BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } + void SetIgnoreBlank(BOOL bSet); + ScAddress GetSrcPos() const { return aSrcPos; } ScAddress GetValidSrcPos() const; // adjusted to allow textual representation of expressions @@ -139,36 +139,36 @@ public: void SetFormula1( const ScTokenArray& rArray ); void SetFormula2( const ScTokenArray& rArray ); - String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, + String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - ScTokenArray* CreateTokenArry( USHORT nPos ) const; + ScTokenArray* CreateTokenArry( USHORT nPos ) const; - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void SourceChanged( const ScAddress& rChanged ); + void SourceChanged( const ScAddress& rChanged ); bool MarkUsedExternalReferences() const; protected: - virtual void DataChanged( const ScRange* pModified ) const; - ScDocument* GetDocument() const { return pDoc; } + virtual void DataChanged( const ScRange* pModified ) const; + ScDocument* GetDocument() const { return pDoc; } }; // -// einzelner Eintrag fuer bedingte Formatierung +// einzelner Eintrag fuer bedingte Formatierung // class ScConditionalFormat; class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry { - String aStyleName; - ScConditionalFormat* pParent; + String aStyleName; + ScConditionalFormat* pParent; using ScConditionEntry::operator==; @@ -187,31 +187,31 @@ public: const String& rStyle ); ScCondFormatEntry( const ScCondFormatEntry& r ); ScCondFormatEntry( ScDocument* pDocument, const ScCondFormatEntry& r ); - virtual ~ScCondFormatEntry(); + virtual ~ScCondFormatEntry(); - void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; } + void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; } - int operator== ( const ScCondFormatEntry& r ) const; + int operator== ( const ScCondFormatEntry& r ) const; - const String& GetStyle() const { return aStyleName; } - void UpdateStyleName(const String& rNew) { aStyleName=rNew; } + const String& GetStyle() const { return aStyleName; } + void UpdateStyleName(const String& rNew) { aStyleName=rNew; } protected: - virtual void DataChanged( const ScRange* pModified ) const; + virtual void DataChanged( const ScRange* pModified ) const; }; // -// komplette bedingte Formatierung +// komplette bedingte Formatierung // class SC_DLLPUBLIC ScConditionalFormat { - ScDocument* pDoc; - ScRangeList* pAreas; // Bereiche fuer Paint - sal_uInt32 nKey; // Index in Attributen - ScCondFormatEntry** ppEntries; - USHORT nEntryCount; - BOOL bIsUsed; // temporaer beim Speichern + ScDocument* pDoc; + ScRangeList* pAreas; // Bereiche fuer Paint + sal_uInt32 nKey; // Index in Attributen + ScCondFormatEntry** ppEntries; + USHORT nEntryCount; + BOOL bIsUsed; // temporaer beim Speichern public: ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument); @@ -221,45 +221,45 @@ public: // echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten) ScConditionalFormat* Clone(ScDocument* pNewDoc = NULL) const; - void AddEntry( const ScCondFormatEntry& rNew ); + void AddEntry( const ScCondFormatEntry& rNew ); - BOOL IsEmpty() const { return (nEntryCount == 0); } - USHORT Count() const { return nEntryCount; } + BOOL IsEmpty() const { return (nEntryCount == 0); } + USHORT Count() const { return nEntryCount; } - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void RenameCellStyle( const String& rOld, const String& rNew ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void RenameCellStyle( const String& rOld, const String& rNew ); - void SourceChanged( const ScAddress& rAddr ); + void SourceChanged( const ScAddress& rAddr ); const ScCondFormatEntry* GetEntry( USHORT nPos ) const; - const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; + const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; - BOOL EqualEntries( const ScConditionalFormat& r ) const; + BOOL EqualEntries( const ScConditionalFormat& r ) const; - void DoRepaint( const ScRange* pModified ); - void InvalidateArea(); + void DoRepaint( const ScRange* pModified ); + void InvalidateArea(); - sal_uInt32 GetKey() const { return nKey; } - void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! + sal_uInt32 GetKey() const { return nKey; } + void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(BOOL bSet) { bIsUsed = bSet; } + BOOL IsUsed() const { return bIsUsed; } bool MarkUsedExternalReferences() const; - // sortiert (per PTRARR) nach Index - // operator== nur fuer die Sortierung - BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } + // sortiert (per PTRARR) nach Index + // operator== nur fuer die Sortierung + BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } + BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } }; // -// Liste der Bereiche und Formate: +// Liste der Bereiche und Formate: // typedef ScConditionalFormat* ScConditionalFormatPtr; @@ -275,25 +275,25 @@ public: ScConditionalFormatList(ScDocument* pNewDoc, const ScConditionalFormatList& rList); ~ScConditionalFormatList() {} - void InsertNew( ScConditionalFormat* pNew ) + void InsertNew( ScConditionalFormat* pNew ) { if (!Insert(pNew)) delete pNew; } ScConditionalFormat* GetFormat( sal_uInt32 nKey ); - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void RenameCellStyle( const String& rOld, const String& rNew ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void RenameCellStyle( const String& rOld, const String& rNew ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void SourceChanged( const ScAddress& rAddr ); + void SourceChanged( const ScAddress& rAddr ); /** Temporarily during save, returns RefManager's decision whether ALL * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index bd74406eb37a..2a1a13768bf3 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -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 @@ -42,21 +42,21 @@ class ScDocumentConfiguration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + SfxItemPropertySet aPropSet; public: ScDocumentConfiguration(ScDocShell* pDocShell); - virtual ~ScDocumentConfiguration(); + virtual ~ScDocumentConfiguration(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -68,25 +68,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 4eb30b12c432..a9074ec0e31f 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -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 @@ -35,97 +35,97 @@ class ScDocument; // ----------------------------------------------------------------------- -struct ScReferenceEntry // ohne Constructor ! +struct ScReferenceEntry // ohne Constructor ! { - SCCOL nCol; - SCROW nRow; - SCTAB nTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; }; -//! Delta-Wert fuer Daten benutzen? +//! Delta-Wert fuer Daten benutzen? -class ScReferenceList // ohne Constructor ! +class ScReferenceList // ohne Constructor ! { private: - SCSIZE nCount; - SCSIZE nFullSize; // inkl. Fuell-Eintraege - ScReferenceEntry* pData; + SCSIZE nCount; + SCSIZE nFullSize; // inkl. Fuell-Eintraege + ScReferenceEntry* pData; public: - void Init() { nCount=0; nFullSize=0; pData=NULL; } - void Clear() { delete[] pData; } + void Init() { nCount=0; nFullSize=0; pData=NULL; } + void Clear() { delete[] pData; } - SCSIZE GetCount() { return nCount; } - const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; } - void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; } + SCSIZE GetCount() { return nCount; } + const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; } + void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; } - void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); }; // ----------------------------------------------------------------------- // -// Reihenfolge: -// 1) ScConsData anlegen -// 2) Parameter (Size/Flags) -// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName) -// 4) DoneFields ( " " ) -// 5) AddData fuer alle Bereiche -// evtl. AddName nach jedem Bereich -// 6) OutputToDocument +// Reihenfolge: +// 1) ScConsData anlegen +// 2) Parameter (Size/Flags) +// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName) +// 4) DoneFields ( " " ) +// 5) AddData fuer alle Bereiche +// evtl. AddName nach jedem Bereich +// 6) OutputToDocument // -//! ab bestimmter Groesse ScDocument Struktur benutzen? +//! ab bestimmter Groesse ScDocument Struktur benutzen? class ScConsData { private: - ScSubTotalFunc eFunction; - BOOL bReference; - BOOL bColByName; - BOOL bRowByName; - BOOL bSubTitles; - SCSIZE nColCount; - SCSIZE nRowCount; - BOOL** ppUsed; - double** ppSum; - double** ppCount; - double** ppSumSqr; - ScReferenceList** ppRefs; - String** ppColHeaders; - String** ppRowHeaders; - SCSIZE nDataCount; - SCSIZE nTitleCount; - String** ppTitles; - SCSIZE** ppTitlePos; - BOOL bCornerUsed; - String aCornerText; // nur bei bColByName && bRowByName + ScSubTotalFunc eFunction; + BOOL bReference; + BOOL bColByName; + BOOL bRowByName; + BOOL bSubTitles; + SCSIZE nColCount; + SCSIZE nRowCount; + BOOL** ppUsed; + double** ppSum; + double** ppCount; + double** ppSumSqr; + ScReferenceList** ppRefs; + String** ppColHeaders; + String** ppRowHeaders; + SCSIZE nDataCount; + SCSIZE nTitleCount; + String** ppTitles; + SCSIZE** ppTitlePos; + BOOL bCornerUsed; + String aCornerText; // nur bei bColByName && bRowByName public: ScConsData(); ~ScConsData(); - void SetSize( SCCOL nCols, SCROW nRows ); - void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); + void SetSize( SCCOL nCols, SCROW nRows ); + void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); - void InitData(BOOL bDelete=TRUE); - void DeleteData(); + void InitData(BOOL bDelete=TRUE); + void DeleteData(); - void AddFields( ScDocument* pSrcDoc, SCTAB nTab, + void AddFields( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void DoneFields(); + void DoneFields(); - void AddData( ScDocument* pSrcDoc, SCTAB nTab, + void AddData( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void AddName( const String& rName ); + void AddName( const String& rName ); - void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ); + void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ); - void GetSize( SCCOL& rCols, SCROW& rRows ) const; - SCROW GetInsertCount() const; + void GetSize( SCCOL& rCols, SCROW& rRows ) const; + SCROW GetInsertCount() const; }; diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx index 0f93d6d6de0d..291476e3e0e6 100644 --- a/sc/inc/convuno.hxx +++ b/sc/inc/convuno.hxx @@ -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 @@ -44,31 +44,31 @@ public: static void FillLocale( com::sun::star::lang::Locale& rLocale, LanguageType eLang ); // CellAddress -> ScAddress - static inline void FillScAddress( + static inline void FillScAddress( ScAddress& rScAddress, const ::com::sun::star::table::CellAddress& rApiAddress ); // ScAddress -> CellAddress - static inline void FillApiAddress( + static inline void FillApiAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ScAddress& rScAddress ); // CellRangeAddress -> ScRange - static inline void FillScRange( + static inline void FillScRange( ScRange& rScRange, const ::com::sun::star::table::CellRangeAddress& rApiRange ); // ScRange -> CellRangeAddress - static inline void FillApiRange( + static inline void FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ScRange& rScRange ); // CellAddress -> CellRangeAddress - static inline void FillApiRange( + static inline void FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ::com::sun::star::table::CellAddress& rApiAddress ); // CellRangeAddress-Start -> CellAddress - static inline void FillApiStartAddress( + static inline void FillApiStartAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ); // CellRangeAddress-End -> CellAddress - static inline void FillApiEndAddress( + static inline void FillApiEndAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ); @@ -87,14 +87,14 @@ public: }; -inline void ScUnoConversion::FillScAddress( +inline void ScUnoConversion::FillScAddress( ScAddress& rScAddress, const ::com::sun::star::table::CellAddress& rApiAddress ) { rScAddress.Set( (SCCOL)rApiAddress.Column, (SCROW)rApiAddress.Row, (SCTAB)rApiAddress.Sheet ); } -inline void ScUnoConversion::FillApiAddress( +inline void ScUnoConversion::FillApiAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ScAddress& rScAddress ) { @@ -103,7 +103,7 @@ inline void ScUnoConversion::FillApiAddress( rApiAddress.Sheet = rScAddress.Tab(); } -inline void ScUnoConversion::FillScRange( +inline void ScUnoConversion::FillScRange( ScRange& rScRange, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { @@ -111,7 +111,7 @@ inline void ScUnoConversion::FillScRange( rScRange.aEnd.Set( (SCCOL)rApiRange.EndColumn, (SCROW)rApiRange.EndRow, (SCTAB)rApiRange.Sheet ); } -inline void ScUnoConversion::FillApiRange( +inline void ScUnoConversion::FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ScRange& rScRange ) { @@ -122,7 +122,7 @@ inline void ScUnoConversion::FillApiRange( rApiRange.EndRow = rScRange.aEnd.Row(); } -inline void ScUnoConversion::FillApiRange( +inline void ScUnoConversion::FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ::com::sun::star::table::CellAddress& rApiAddress ) { @@ -131,7 +131,7 @@ inline void ScUnoConversion::FillApiRange( rApiRange.Sheet = rApiAddress.Sheet; } -inline void ScUnoConversion::FillApiStartAddress( +inline void ScUnoConversion::FillApiStartAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { @@ -140,7 +140,7 @@ inline void ScUnoConversion::FillApiStartAddress( rApiAddress.Sheet = rApiRange.Sheet; } -inline void ScUnoConversion::FillApiEndAddress( +inline void ScUnoConversion::FillApiEndAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index 470f4e3c6f5c..5c63e530d7e6 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -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 @@ -40,35 +40,35 @@ class ScCellCursorObj : public ScCellRangeObj, { public: ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellCursorObj(); + virtual ~ScCellCursorObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XSheetCellCursor - virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToCurrentArray() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) + virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToCurrentArray() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) throw(::com::sun::star::uno::RuntimeException); // XUsedAreaCursor - virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) + virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) + virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); // XCellCursor - virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) + virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) throw(::com::sun::star::uno::RuntimeException); // XSheetCellRange diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index c9a5305a05ca..f0d7bf45b626 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -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 @@ -30,7 +30,7 @@ #include "global.hxx" #include "dpobject.hxx" -#include "rangeutl.hxx" // ScArea +#include "rangeutl.hxx" // ScArea #include "cellsuno.hxx" // for XModifyListenerArr_Impl #include @@ -85,8 +85,8 @@ class ScDataPilotItemObj; class ScDataPilotConversion { public: - static com::sun::star::sheet::GeneralFunction FirstFunc( USHORT nBits ); - static USHORT FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); + static com::sun::star::sheet::GeneralFunction FirstFunc( USHORT nBits ); + static USHORT FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); static void FillGroupInfo( ::com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo, @@ -104,27 +104,27 @@ class ScDataPilotTablesObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; + ScDocShell* pDocShell; + SCTAB nTab; ScDataPilotTableObj* GetObjectByIndex_Impl( sal_Int32 nIndex ); - ScDataPilotTableObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDataPilotTableObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScDataPilotTablesObj(); + virtual ~ScDataPilotTablesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDataPilotTables virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > SAL_CALL createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, const ::com::sun::star::table::CellAddress& aOutputAddress, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -164,7 +164,7 @@ public: // ============================================================================ -// ScDataPilotDescriptorBase is never instantiated directly +// ScDataPilotDescriptorBase is never instantiated directly class ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor, public com::sun::star::beans::XPropertySet, public com::sun::star::sheet::XDataPilotDataLayoutFieldSupplier, @@ -180,24 +180,24 @@ private: public: ScDataPilotDescriptorBase(ScDocShell* pDocSh); - virtual ~ScDataPilotDescriptorBase(); + virtual ~ScDataPilotDescriptorBase(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - ScDocShell* GetDocShell() const { return pDocShell; } + ScDocShell* GetDocShell() const { return pDocShell; } // in den Ableitungen: virtual ScDPObject* GetDPObject() const = 0; virtual void SetDPObject(ScDPObject* pDPObj) = 0; // XDataPilotDescriptor - // getName, setName, getTag, setTag in derived classes + // getName, setName, getTag, setTag in derived classes virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getSourceRange() throw(::com::sun::star::uno::RuntimeException); @@ -222,7 +222,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -234,25 +234,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -291,17 +291,17 @@ private: public: ScDataPilotDescriptor(ScDocShell* pDocSh); - virtual ~ScDataPilotDescriptor(); + virtual ~ScDataPilotDescriptor(); virtual ScDPObject* GetDPObject() const; virtual void SetDPObject(ScDPObject* pDPObj); // rest of XDataPilotDescriptor (incl. XNamed) virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -320,21 +320,21 @@ class ScDataPilotTableObj : public ScDataPilotDescriptorBase, public com::sun::star::util::XModifyBroadcaster { private: - SCTAB nTab; - String aName; + SCTAB nTab; + String aName; XModifyListenerArr_Impl aModifyListeners; void Refreshed_Impl(); public: ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const String& rN); - virtual ~ScDataPilotTableObj(); + virtual ~ScDataPilotTableObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -343,16 +343,16 @@ public: // rest of XDataPilotDescriptor (incl. XNamed) virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XDataPilotTable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRange() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); // XDataPilotTable2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > @@ -536,14 +536,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -555,25 +555,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -835,7 +835,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -928,14 +928,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -947,25 +947,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 79902b367ac7..03d0edc1c208 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -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 @@ -72,43 +72,43 @@ SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4, 4 ) class ScDataUnoConversion { public: - static ScSubTotalFunc GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary ); + static ScSubTotalFunc GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary ); static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); }; -// ImportDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence +// ImportDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence class ScImportDescriptor { public: - static void FillImportParam( + static void FillImportParam( ScImportParam& rParam, const com::sun::star::uno::Sequence& rSeq ); - static void FillProperties( + static void FillProperties( com::sun::star::uno::Sequence& rSeq, const ScImportParam& rParam ); static long GetPropertyCount(); }; -// SortDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence +// SortDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence class ScSortDescriptor { public: - static void FillSortParam( + static void FillSortParam( ScSortParam& rParam, const com::sun::star::uno::Sequence& rSeq ); - static void FillProperties( + static void FillProperties( com::sun::star::uno::Sequence& rSeq, const ScSortParam& rParam ); static long GetPropertyCount(); }; -// ScSubTotalDescriptorBase - Basisklasse fuer SubTotalDescriptor alleine und im DB-Bereich +// ScSubTotalDescriptorBase - Basisklasse fuer SubTotalDescriptor alleine und im DB-Bereich -// to uno, both look the same +// to uno, both look the same class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< com::sun::star::sheet::XSubTotalDescriptor, @@ -119,25 +119,25 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; - ScSubTotalFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScSubTotalFieldObj* GetObjectByIndex_Impl(USHORT nIndex); public: ScSubTotalDescriptorBase(); - virtual ~ScSubTotalDescriptorBase(); + virtual ~ScSubTotalDescriptorBase(); // in derived classes: // (Fields are within the range) - virtual void GetData( ScSubTotalParam& rParam ) const = 0; - virtual void PutData( const ScSubTotalParam& rParam ) = 0; + virtual void GetData( ScSubTotalParam& rParam ) const = 0; + virtual void PutData( const ScSubTotalParam& rParam ) = 0; // XSubTotalDescriptor - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns, sal_Int32 nGroupColumn ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -159,7 +159,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -171,25 +171,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -215,41 +215,41 @@ public: }; -// ScSubTotalDescriptor - dummer Container zur Benutzung mit XImportTarget +// ScSubTotalDescriptor - dummer Container zur Benutzung mit XImportTarget class ScSubTotalDescriptor : public ScSubTotalDescriptorBase { private: - ScSubTotalParam aStoredParam; + ScSubTotalParam aStoredParam; public: ScSubTotalDescriptor(); - virtual ~ScSubTotalDescriptor(); + virtual ~ScSubTotalDescriptor(); // von ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const; - virtual void PutData( const ScSubTotalParam& rParam ); + virtual void GetData( ScSubTotalParam& rParam ) const; + virtual void PutData( const ScSubTotalParam& rParam ); // Zugriff von aussen: - void SetParam( const ScSubTotalParam& rNew ); -// const ScSubTotalParam& GetParam() const { return aStoredParam; } + void SetParam( const ScSubTotalParam& rNew ); +// const ScSubTotalParam& GetParam() const { return aStoredParam; } }; -// ScRangeSubTotalDescriptor - SubTotalDescriptor eines Datenbank-Bereichs +// ScRangeSubTotalDescriptor - SubTotalDescriptor eines Datenbank-Bereichs class ScRangeSubTotalDescriptor : public ScSubTotalDescriptorBase { private: - ScDatabaseRangeObj* pParent; + ScDatabaseRangeObj* pParent; public: ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar); - virtual ~ScRangeSubTotalDescriptor(); + virtual ~ScRangeSubTotalDescriptor(); // von ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const; - virtual void PutData( const ScSubTotalParam& rParam ); + virtual void GetData( ScSubTotalParam& rParam ) const; + virtual void PutData( const ScSubTotalParam& rParam ); }; @@ -259,20 +259,20 @@ class ScSubTotalFieldObj : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference xRef; - ScSubTotalDescriptorBase& rParent; - USHORT nPos; + ScSubTotalDescriptorBase& rParent; + USHORT nPos; public: ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ); - virtual ~ScSubTotalFieldObj(); + virtual ~ScSubTotalFieldObj(); // XSubTotalField virtual sal_Int32 SAL_CALL getGroupColumn() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) + virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn > SAL_CALL getSubTotalColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns ) throw(::com::sun::star::uno::RuntimeException); @@ -291,38 +291,38 @@ class ScConsolidationDescriptor : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScConsolidateParam aParam; + ScConsolidateParam aParam; public: ScConsolidationDescriptor(); - virtual ~ScConsolidationDescriptor(); + virtual ~ScConsolidationDescriptor(); - void SetParam( const ScConsolidateParam& rNew ); - const ScConsolidateParam& GetParam() const { return aParam; } + void SetParam( const ScConsolidateParam& rNew ); + const ScConsolidateParam& GetParam() const { return aParam; } // XConsolidationDescriptor virtual ::com::sun::star::sheet::GeneralFunction SAL_CALL getFunction() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) + virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getSources( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aSources ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getStartOutputPosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStartOutputPosition( + virtual void SAL_CALL setStartOutputPosition( const ::com::sun::star::table::CellAddress& aStartOutputPosition ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) + virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getUseRowHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) + virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getInsertLinks() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) + virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -335,10 +335,10 @@ public: }; -// ScFilterDescriptorBase - Basisklasse fuer FilterDescriptor -// alleine, im DB-Bereich und im DataPilot +// ScFilterDescriptorBase - Basisklasse fuer FilterDescriptor +// alleine, im DB-Bereich und im DataPilot -// to uno, all three look the same +// to uno, all three look the same class ScFilterDescriptorBase : public cppu::WeakImplHelper4< com::sun::star::sheet::XSheetFilterDescriptor, @@ -348,31 +348,31 @@ class ScFilterDescriptorBase : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; ScDocShell* pDocSh; public: ScFilterDescriptorBase(ScDocShell* pDocShell); - virtual ~ScFilterDescriptorBase(); + virtual ~ScFilterDescriptorBase(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // in den Ableitungen: // (nField[] hier innerhalb des Bereichs) - virtual void GetData( ScQueryParam& rParam ) const = 0; - virtual void PutData( const ScQueryParam& rParam ) = 0; + virtual void GetData( ScQueryParam& rParam ) const = 0; + virtual void PutData( const ScQueryParam& rParam ) = 0; // XSheetFilterDescriptor virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField > SAL_CALL getFilterFields() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField >& aFilterFields ) throw(::com::sun::star::uno::RuntimeException); // XSheetFilterDescriptor2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 > SAL_CALL getFilterFields2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 >& aFilterFields ) throw(::com::sun::star::uno::RuntimeException); @@ -380,7 +380,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -392,25 +392,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -427,58 +427,58 @@ public: }; -// ScFilterDescriptor - dummer Container zur Benutzung mit XFilterable +// ScFilterDescriptor - dummer Container zur Benutzung mit XFilterable class ScFilterDescriptor : public ScFilterDescriptorBase { private: - ScQueryParam aStoredParam; // nField[] hier innerhalb des Bereichs + ScQueryParam aStoredParam; // nField[] hier innerhalb des Bereichs public: ScFilterDescriptor(ScDocShell* pDocSh); - virtual ~ScFilterDescriptor(); + virtual ~ScFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); // Zugriff von aussen: - void SetParam( const ScQueryParam& rNew ); - const ScQueryParam& GetParam() const { return aStoredParam; } + void SetParam( const ScQueryParam& rNew ); + const ScQueryParam& GetParam() const { return aStoredParam; } }; -// ScRangeFilterDescriptor - FilterDescriptor eines Datenbank-Bereichs +// ScRangeFilterDescriptor - FilterDescriptor eines Datenbank-Bereichs class ScRangeFilterDescriptor : public ScFilterDescriptorBase { private: - ScDatabaseRangeObj* pParent; + ScDatabaseRangeObj* pParent; public: ScRangeFilterDescriptor(ScDocShell* pDocSh, ScDatabaseRangeObj* pPar); - virtual ~ScRangeFilterDescriptor(); + virtual ~ScRangeFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); }; -// ScDataPilotFilterDescriptor - FilterDescriptor eines DataPilotDescriptors +// ScDataPilotFilterDescriptor - FilterDescriptor eines DataPilotDescriptors class ScDataPilotFilterDescriptor : public ScFilterDescriptorBase { private: - ScDataPilotDescriptorBase* pParent; + ScDataPilotDescriptorBase* pParent; public: ScDataPilotFilterDescriptor(ScDocShell* pDocSh, ScDataPilotDescriptorBase* pPar); - virtual ~ScDataPilotFilterDescriptor(); + virtual ~ScDataPilotFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); }; @@ -492,36 +492,36 @@ class ScDatabaseRangeObj : public cppu::WeakImplHelper6< public SfxListener { private: - ScDocShell* pDocShell; - String aName; - SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + String aName; + SfxItemPropertySet aPropSet; XDBRefreshListenerArr_Impl aRefreshListeners; private: - ScDBData* GetDBData_Impl() const; - void Refreshed_Impl(); + ScDBData* GetDBData_Impl() const; + void Refreshed_Impl(); public: ScDatabaseRangeObj(ScDocShell* pDocSh, const String& rNm); - virtual ~ScDatabaseRangeObj(); + virtual ~ScDatabaseRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // nField[] hier innerhalb des Bereichs: - void GetQueryParam(ScQueryParam& rQueryParam) const; - void SetQueryParam(const ScQueryParam& rQueryParam); - void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; - void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); + void GetQueryParam(ScQueryParam& rQueryParam) const; + void SetQueryParam(const ScQueryParam& rQueryParam); + void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; + void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDatabaseRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) + virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getSortDescriptor() throw(::com::sun::star::uno::RuntimeException); @@ -532,14 +532,14 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getImportDescriptor() throw(::com::sun::star::uno::RuntimeException); // implemented for the XRefreshable Interface -// virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); +// virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -551,7 +551,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -563,25 +563,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -606,22 +606,22 @@ class ScDatabaseRangesObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScDatabaseRangeObj* GetObjectByIndex_Impl(USHORT nIndex); - ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDatabaseRangeObj* GetObjectByIndex_Impl(USHORT nIndex); + ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDatabaseRangesObj(ScDocShell* pDocSh); - virtual ~ScDatabaseRangesObj(); + virtual ~ScDatabaseRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDatabaseRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 72356683d1a4..840977b7d73c 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -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 @@ -30,8 +30,8 @@ #include "scdllapi.h" #include "collect.hxx" -#include "global.hxx" // MAXQUERY -#include "sortparam.hxx" // MAXSORT +#include "global.hxx" // MAXQUERY +#include "sortparam.hxx" // MAXSORT #include "refreshtimer.hxx" #include "address.hxx" #include "scdllapi.h" @@ -47,76 +47,76 @@ class ScDBData : public ScDataObject, public ScRefreshTimer private: // DBParam - String aName; - SCTAB nTable; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - BOOL bByRow; - BOOL bHasHeader; - BOOL bDoSize; - BOOL bKeepFmt; - BOOL bStripData; + String aName; + SCTAB nTable; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + BOOL bByRow; + BOOL bHasHeader; + BOOL bDoSize; + BOOL bKeepFmt; + BOOL bStripData; // SortParam - BOOL bSortCaseSens; - BOOL bIncludePattern; - BOOL bSortInplace; - BOOL bSortUserDef; - USHORT nSortUserIndex; - SCTAB nSortDestTab; - SCCOL nSortDestCol; - SCROW nSortDestRow; - BOOL bDoSort[MAXSORT]; - SCCOLROW nSortField[MAXSORT]; - BOOL bAscending[MAXSORT]; + BOOL bSortCaseSens; + BOOL bIncludePattern; + BOOL bSortInplace; + BOOL bSortUserDef; + USHORT nSortUserIndex; + SCTAB nSortDestTab; + SCCOL nSortDestCol; + SCROW nSortDestRow; + BOOL bDoSort[MAXSORT]; + SCCOLROW nSortField[MAXSORT]; + BOOL bAscending[MAXSORT]; ::com::sun::star::lang::Locale aSortLocale; - String aSortAlgorithm; + String aSortAlgorithm; // QueryParam - BOOL bQueryInplace; - BOOL bQueryCaseSens; - BOOL bQueryRegExp; - BOOL bQueryDuplicate; - SCTAB nQueryDestTab; - SCCOL nQueryDestCol; - SCROW nQueryDestRow; - BOOL bDoQuery[MAXQUERY]; - SCCOLROW nQueryField[MAXQUERY]; - ScQueryOp eQueryOp[MAXQUERY]; - BOOL bQueryByString[MAXQUERY]; + BOOL bQueryInplace; + BOOL bQueryCaseSens; + BOOL bQueryRegExp; + BOOL bQueryDuplicate; + SCTAB nQueryDestTab; + SCCOL nQueryDestCol; + SCROW nQueryDestRow; + BOOL bDoQuery[MAXQUERY]; + SCCOLROW nQueryField[MAXQUERY]; + ScQueryOp eQueryOp[MAXQUERY]; + BOOL bQueryByString[MAXQUERY]; bool bQueryByDate[MAXQUERY]; - String* pQueryStr[MAXQUERY]; - double nQueryVal[MAXQUERY]; + String* pQueryStr[MAXQUERY]; + double nQueryVal[MAXQUERY]; ScQueryConnect eQueryConnect[MAXQUERY]; - BOOL bIsAdvanced; // TRUE if created by advanced filter - ScRange aAdvSource; // source range + BOOL bIsAdvanced; // TRUE if created by advanced filter + ScRange aAdvSource; // source range // SubTotalParam - BOOL bSubRemoveOnly; - BOOL bSubReplace; - BOOL bSubPagebreak; - BOOL bSubCaseSens; - BOOL bSubDoSort; - BOOL bSubAscending; - BOOL bSubIncludePattern; - BOOL bSubUserDef; - USHORT nSubUserIndex; - BOOL bDoSubTotal[MAXSUBTOTAL]; - SCCOL nSubField[MAXSUBTOTAL]; - SCCOL nSubTotals[MAXSUBTOTAL]; - SCCOL* pSubTotals[MAXSUBTOTAL]; - ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; + BOOL bSubRemoveOnly; + BOOL bSubReplace; + BOOL bSubPagebreak; + BOOL bSubCaseSens; + BOOL bSubDoSort; + BOOL bSubAscending; + BOOL bSubIncludePattern; + BOOL bSubUserDef; + USHORT nSubUserIndex; + BOOL bDoSubTotal[MAXSUBTOTAL]; + SCCOL nSubField[MAXSUBTOTAL]; + SCCOL nSubTotals[MAXSUBTOTAL]; + SCCOL* pSubTotals[MAXSUBTOTAL]; + ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Datenbank-Import - BOOL bDBImport; - String aDBName; - String aDBStatement; - BOOL bDBNative; - BOOL bDBSelection; // nicht im Param: Wenn Selektion, Update sperren - BOOL bDBSql; // aDBStatement ist SQL und kein Name - BYTE nDBType; // enum DBObject (bisher nur dbTable, dbQuery) - - USHORT nIndex; // eindeutiger Index fuer Formeln - BOOL bAutoFilter; // AutoFilter? (nicht gespeichert) - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + BOOL bDBImport; + String aDBName; + String aDBStatement; + BOOL bDBNative; + BOOL bDBSelection; // nicht im Param: Wenn Selektion, Update sperren + BOOL bDBSql; // aDBStatement ist SQL und kein Name + BYTE nDBType; // enum DBObject (bisher nur dbTable, dbQuery) + + USHORT nIndex; // eindeutiger Index fuer Formeln + BOOL bAutoFilter; // AutoFilter? (nicht gespeichert) + BOOL bModified; // wird bei UpdateReference gesetzt/geloescht using ScRefreshTimer::operator==; @@ -128,67 +128,67 @@ public: ScDBData(const ScDBData& rData); ~ScDBData(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScDBData& operator= (const ScDBData& rData); + ScDBData& operator= (const ScDBData& rData); - BOOL operator== (const ScDBData& rData) const; + BOOL operator== (const ScDBData& rData) const; - const String& GetName() const { return aName; } - void GetName(String& rName) const { rName = aName; } - void SetName(const String& rName) { aName = rName; } - void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; - SC_DLLPUBLIC void GetArea(ScRange& rRange) const; - void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - BOOL IsByRow() const { return bByRow; } - void SetByRow(BOOL bByR) { bByRow = bByR; } - BOOL HasHeader() const { return bHasHeader; } - void SetHeader(BOOL bHasH) { bHasHeader = bHasH; } + const String& GetName() const { return aName; } + void GetName(String& rName) const { rName = aName; } + void SetName(const String& rName) { aName = rName; } + void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; + SC_DLLPUBLIC void GetArea(ScRange& rRange) const; + void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); + void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); + BOOL IsByRow() const { return bByRow; } + void SetByRow(BOOL bByR) { bByRow = bByR; } + BOOL HasHeader() const { return bHasHeader; } + void SetHeader(BOOL bHasH) { bHasHeader = bHasH; } void SetIndex(USHORT nInd) { nIndex = nInd; } - USHORT GetIndex() const { return nIndex; } - BOOL IsDoSize() const { return bDoSize; } - void SetDoSize(BOOL bSet) { bDoSize = bSet; } - BOOL IsKeepFmt() const { return bKeepFmt; } - void SetKeepFmt(BOOL bSet) { bKeepFmt = bSet; } - BOOL IsStripData() const { return bStripData; } - void SetStripData(BOOL bSet) { bStripData = bSet; } + USHORT GetIndex() const { return nIndex; } + BOOL IsDoSize() const { return bDoSize; } + void SetDoSize(BOOL bSet) { bDoSize = bSet; } + BOOL IsKeepFmt() const { return bKeepFmt; } + void SetKeepFmt(BOOL bSet) { bKeepFmt = bSet; } + BOOL IsStripData() const { return bStripData; } + void SetStripData(BOOL bSet) { bStripData = bSet; } -//UNUSED2008-05 BOOL IsBeyond(SCROW nMaxRow) const; +//UNUSED2008-05 BOOL IsBeyond(SCROW nMaxRow) const; - String GetSourceString() const; - String GetOperations() const; + String GetSourceString() const; + String GetOperations() const; - void GetSortParam(ScSortParam& rSortParam) const; - void SetSortParam(const ScSortParam& rSortParam); + void GetSortParam(ScSortParam& rSortParam) const; + void SetSortParam(const ScSortParam& rSortParam); - SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; - SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); - SC_DLLPUBLIC BOOL GetAdvancedQuerySource(ScRange& rSource) const; - SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); + SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; + SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); + SC_DLLPUBLIC BOOL GetAdvancedQuerySource(ScRange& rSource) const; + SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); - void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; - void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); + void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; + void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); - void GetImportParam(ScImportParam& rImportParam) const; - void SetImportParam(const ScImportParam& rImportParam); + void GetImportParam(ScImportParam& rImportParam) const; + void SetImportParam(const ScImportParam& rImportParam); - BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; - BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; + BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL HasImportParam() const { return bDBImport; } - BOOL HasQueryParam() const { return bDoQuery[0]; } - BOOL HasSortParam() const { return bDoSort[0]; } - BOOL HasSubTotalParam() const { return bDoSubTotal[0]; } + BOOL HasImportParam() const { return bDBImport; } + BOOL HasQueryParam() const { return bDoQuery[0]; } + BOOL HasSortParam() const { return bDoSort[0]; } + BOOL HasSubTotalParam() const { return bDoSubTotal[0]; } - BOOL HasImportSelection() const { return bDBSelection; } - void SetImportSelection(BOOL bSet) { bDBSelection = bSet; } + BOOL HasImportSelection() const { return bDBSelection; } + void SetImportSelection(BOOL bSet) { bDBSelection = bSet; } - BOOL HasAutoFilter() const { return bAutoFilter; } - void SetAutoFilter(BOOL bSet) { bAutoFilter = bSet; } + BOOL HasAutoFilter() const { return bAutoFilter; } + void SetAutoFilter(BOOL bSet) { bAutoFilter = bSet; } - BOOL IsModified() const { return bModified; } - void SetModified(BOOL bMod) { bModified = bMod; } + BOOL IsModified() const { return bModified; } + void SetModified(BOOL bMod) { bModified = bMod; } }; @@ -197,46 +197,46 @@ class SC_DLLPUBLIC ScDBCollection : public ScSortedCollection { private: - Link aRefreshHandler; + Link aRefreshHandler; ScDocument* pDoc; - USHORT nEntryIndex; // Zaehler fuer die eindeutigen Indizes + USHORT nEntryIndex; // Zaehler fuer die eindeutigen Indizes public: ScDBCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : - ScSortedCollection ( nLim, nDel, bDup ), - pDoc ( pDocument ), - nEntryIndex ( SC_START_INDEX_DB_COLL ) // oberhalb der Namen + ScSortedCollection ( nLim, nDel, bDup ), + pDoc ( pDocument ), + nEntryIndex ( SC_START_INDEX_DB_COLL ) // oberhalb der Namen {} ScDBCollection(const ScDBCollection& rScDBCollection) : - ScSortedCollection ( rScDBCollection ), - pDoc ( rScDBCollection.pDoc ), - nEntryIndex ( rScDBCollection.nEntryIndex) + ScSortedCollection ( rScDBCollection ), + pDoc ( rScDBCollection.pDoc ), + nEntryIndex ( rScDBCollection.nEntryIndex) {} - virtual ScDataObject* Clone() const { return new ScDBCollection(*this); } - ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; - ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + virtual ScDataObject* Clone() const { return new ScDBCollection(*this); } + ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; + ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL SearchName( const String& rName, USHORT& rIndex ) const; + BOOL SearchName( const String& rName, USHORT& rIndex ) const; void DeleteOnTab( SCTAB nTab ); - void UpdateReference(UpdateRefMode eUpdateRefMode, + void UpdateReference(UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); ScDBData* FindIndex(USHORT nIndex); - USHORT GetEntryIndex() { return nEntryIndex; } - void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; } + USHORT GetEntryIndex() { return nEntryIndex; } + void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; } virtual BOOL Insert(ScDataObject* pScDataObject); - void SetRefreshHandler( const Link& rLink ) + void SetRefreshHandler( const Link& rLink ) { aRefreshHandler = rLink; } - const Link& GetRefreshHandler() const { return aRefreshHandler; } + const Link& GetRefreshHandler() const { return aRefreshHandler; } }; #endif diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index 3071b542f4b6..2ee1e37cf208 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -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/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxx index 1cdacfd97323..1fe6f192a29e 100644 --- a/sc/inc/dbtoken.hxx +++ b/sc/inc/dbtoken.hxx @@ -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/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 5ef4f501061a..9b964b491f03 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -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 @@ -45,22 +45,22 @@ class ScDocDefaultsObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; SfxItemPropertyMap aPropertyMap; - void ItemsChanged(); + void ItemsChanged(); public: ScDocDefaultsObj(ScDocShell* pDocSh); - virtual ~ScDocDefaultsObj(); + virtual ~ScDocDefaultsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -72,25 +72,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -107,7 +107,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 31055c270fbf..89609d516b56 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -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 @@ -35,7 +35,7 @@ //------------------------------------------------------------------------ -#define SC_DETOP_GROW 4 +#define SC_DETOP_GROW 4 //------------------------------------------------------------------------ enum ScDetOpType @@ -51,8 +51,8 @@ enum ScDetOpType class ScDetOpData { - ScAddress aPos; - ScDetOpType eOperation; + ScAddress aPos; + ScDetOpType eOperation; public: ScDetOpData( const ScAddress& rP, ScDetOpType eOp ) : @@ -61,20 +61,20 @@ public: ScDetOpData( const ScDetOpData& rData ) : aPos(rData.aPos), eOperation(rData.eOperation) {} - const ScAddress& GetPos() const { return aPos; } - ScDetOpType GetOperation() const { return eOperation; } + const ScAddress& GetPos() const { return aPos; } + ScDetOpType GetOperation() const { return eOperation; } // fuer UpdateRef: - void SetPos(const ScAddress& rNew) { aPos=rNew; } + void SetPos(const ScAddress& rNew) { aPos=rNew; } - int operator== ( const ScDetOpData& r ) const + int operator== ( const ScDetOpData& r ) const { return eOperation == r.eOperation && aPos == r.aPos; } }; //------------------------------------------------------------------------ // -// Liste der Operationen +// Liste der Operationen // typedef ScDetOpData* ScDetOpDataPtr; @@ -83,7 +83,7 @@ SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW class ScDetOpList : public ScDetOpArr_Impl { - BOOL bHasAddError; // updated in Append + BOOL bHasAddError; // updated in Append public: ScDetOpList() : bHasAddError(FALSE) {} @@ -91,14 +91,14 @@ public: ~ScDetOpList() {} void DeleteOnTab( SCTAB nTab ); - void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, + void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL operator==( const ScDetOpList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScDetOpList& r ) const; // fuer Ref-Undo - void Append( ScDetOpData* pData ); + void Append( ScDetOpData* pData ); - BOOL HasAddError() const { return bHasAddError; } + BOOL HasAddError() const { return bHasAddError; } }; diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 5c57d32af898..4e72deafe86b 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -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 @@ -44,7 +44,7 @@ class ScDocument; class ScAddress; class ScRange; -#define SC_DET_MAXCIRCLE 1000 +#define SC_DET_MAXCIRCLE 1000 enum ScDetectiveDelete { SC_DET_ALL, SC_DET_DETECTIVE, SC_DET_CIRCLES, SC_DET_ARROWS }; @@ -62,10 +62,10 @@ class SC_DLLPUBLIC ScDetectiveFunc static ColorData nArrowColor; static ColorData nErrorColor; static ColorData nCommentColor; - static BOOL bColorsInitialized; + static BOOL bColorsInitialized; - ScDocument* pDoc; - SCTAB nTab; + ScDocument* pDoc; + SCTAB nTab; enum DrawPosMode { @@ -85,80 +85,80 @@ class SC_DLLPUBLIC ScDetectiveFunc /** Returns the drawing layer rectangle for the passed cell address. */ Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const; - BOOL HasArrow( const ScAddress& rStart, + BOOL HasArrow( const ScAddress& rStart, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); - void DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ); - void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); + void DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ); + void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - BOOL HasError( const ScRange& rRange, ScAddress& rErrPos ); + BOOL HasError( const ScRange& rRange, ScAddress& rErrPos ); - void FillAttributes( ScDetectiveData& rData ); + void FillAttributes( ScDetectiveData& rData ); // called from DrawEntry/DrawAlienEntry and InsertObject - BOOL InsertArrow( SCCOL nCol, SCROW nRow, + BOOL InsertArrow( SCCOL nCol, SCROW nRow, SCCOL nRefStartCol, SCROW nRefStartRow, SCCOL nRefEndCol, SCROW nRefEndRow, BOOL bFromOtherTab, BOOL bRed, ScDetectiveData& rData ); - BOOL InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, + BOOL InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bRed, ScDetectiveData& rData ); // DrawEntry / DrawAlienEntry check for existing arrows and errors - BOOL DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, + BOOL DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, ScDetectiveData& rData ); - BOOL DrawAlienEntry( const ScRange& rRef, + BOOL DrawAlienEntry( const ScRange& rRef, ScDetectiveData& rData ); - void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); + void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); - USHORT InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); - USHORT InsertPredLevelArea( const ScRange& rRef, + USHORT InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); + USHORT InsertPredLevelArea( const ScRange& rRef, ScDetectiveData& rData, USHORT nLevel ); - USHORT FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ); - USHORT FindPredLevelArea( const ScRange& rRef, + USHORT FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ); + USHORT FindPredLevelArea( const ScRange& rRef, USHORT nLevel, USHORT nDeleteLevel ); - USHORT InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); + USHORT InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); - USHORT InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + USHORT InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScDetectiveData& rData, USHORT nLevel ); - USHORT FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + USHORT FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nLevel, USHORT nDeleteLevel ); - BOOL FindFrameForObject( SdrObject* pObject, ScRange& rRange ); + BOOL FindFrameForObject( SdrObject* pObject, ScRange& rRange ); void Modified(); public: ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {} - BOOL ShowSucc( SCCOL nCol, SCROW nRow ); - BOOL ShowPred( SCCOL nCol, SCROW nRow ); - BOOL ShowError( SCCOL nCol, SCROW nRow ); + BOOL ShowSucc( SCCOL nCol, SCROW nRow ); + BOOL ShowPred( SCCOL nCol, SCROW nRow ); + BOOL ShowError( SCCOL nCol, SCROW nRow ); - BOOL DeleteSucc( SCCOL nCol, SCROW nRow ); - BOOL DeletePred( SCCOL nCol, SCROW nRow ); - BOOL DeleteAll( ScDetectiveDelete eWhat ); + BOOL DeleteSucc( SCCOL nCol, SCROW nRow ); + BOOL DeletePred( SCCOL nCol, SCROW nRow ); + BOOL DeleteAll( ScDetectiveDelete eWhat ); - BOOL MarkInvalid(BOOL& rOverflow); + BOOL MarkInvalid(BOOL& rOverflow); static void UpdateAllComments( ScDocument& rDoc ); // on all tables - void UpdateAllArrowColors(); // on all tables + void UpdateAllArrowColors(); // on all tables - static BOOL IsNonAlienArrow( SdrObject* pObject ); + static BOOL IsNonAlienArrow( SdrObject* pObject ); ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine ); - void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, + void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, const ScRange& rSource, BOOL bRedLine ); static ColorData GetArrowColor(); static ColorData GetErrorColor(); static ColorData GetCommentColor(); static void InitializeColors(); - static BOOL IsColorsInitialized(); + static BOOL IsColorsInitialized(); }; diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 9526ed8ae3db..643d69861065 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -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 @@ -33,7 +33,7 @@ #include #include #include -#include "global.hxx" // ScImportParam +#include "global.hxx" // ScImportParam namespace com { namespace sun { namespace star { namespace frame { @@ -53,7 +53,7 @@ class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< com::sun::star::lang::XEventListener>, public SfxListener { - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; // the component which's dispatches we're intercepting ::com::sun::star::uno::Reference< @@ -72,9 +72,9 @@ class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< public: ScDispatchProviderInterceptor(ScTabViewShell* pViewSh); - virtual ~ScDispatchProviderInterceptor(); + virtual ~ScDispatchProviderInterceptor(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL @@ -91,17 +91,17 @@ public: // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); }; @@ -111,28 +111,28 @@ class ScDispatch : public cppu::WeakImplHelper2< com::sun::star::view::XSelectionChangeListener >, public SfxListener { - ScTabViewShell* pViewShell; - XStatusListenerArr_Impl aDataSourceListeners; - ScImportParam aLastImport; - sal_Bool bListeningToView; + ScTabViewShell* pViewShell; + XStatusListenerArr_Impl aDataSourceListeners; + ScImportParam aLastImport; + sal_Bool bListeningToView; public: ScDispatch(ScTabViewShell* pViewSh); - virtual ~ScDispatch(); + virtual ~ScDispatch(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index d995550a2f1d..d63a08a3d9ba 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -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 @@ -45,68 +45,68 @@ class ScAttrArray; class ScAttrIterator; class ScRange; -class ScDocumentIterator // alle nichtleeren Zellen durchgehen +class ScDocumentIterator // alle nichtleeren Zellen durchgehen { private: - ScDocument* pDoc; - SCTAB nStartTab; - SCTAB nEndTab; + ScDocument* pDoc; + SCTAB nStartTab; + SCTAB nEndTab; - const ScPatternAttr* pDefPattern; + const ScPatternAttr* pDefPattern; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - ScBaseCell* pCell; - const ScPatternAttr* pPattern; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + ScBaseCell* pCell; + const ScPatternAttr* pPattern; - SCSIZE nColPos; - SCSIZE nAttrPos; + SCSIZE nColPos; + SCSIZE nAttrPos; - BOOL GetThis(); - BOOL GetThisCol(); + BOOL GetThis(); + BOOL GetThisCol(); public: ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ); ~ScDocumentIterator(); - BOOL GetFirst(); - BOOL GetNext(); + BOOL GetFirst(); + BOOL GetNext(); - ScBaseCell* GetCell(); - const ScPatternAttr* GetPattern(); - void GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); + ScBaseCell* GetCell(); + const ScPatternAttr* GetPattern(); + void GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); }; class ScValueIterator // alle Zahlenwerte in einem Bereich durchgehen { private: - double fNextValue; - ScDocument* pDoc; - const ScAttrArray* pAttrArray; - ULONG nNumFormat; // fuer CalcAsShown - ULONG nNumFmtIndex; - SCCOL nStartCol; - SCROW nStartRow; - SCTAB nStartTab; - SCCOL nEndCol; - SCROW nEndRow; - SCTAB nEndTab; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCSIZE nColRow; - SCROW nNextRow; - SCROW nAttrEndRow; - short nNumFmtType; - BOOL bNumValid; - BOOL bSubTotal; - BOOL bNextValid; - BOOL bCalcAsShown; - BOOL bTextAsZero; - - BOOL GetThis(double& rValue, USHORT& rErr); + double fNextValue; + ScDocument* pDoc; + const ScAttrArray* pAttrArray; + ULONG nNumFormat; // fuer CalcAsShown + ULONG nNumFmtIndex; + SCCOL nStartCol; + SCROW nStartRow; + SCTAB nStartTab; + SCCOL nEndCol; + SCROW nEndRow; + SCTAB nEndTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCSIZE nColRow; + SCROW nNextRow; + SCROW nAttrEndRow; + short nNumFmtType; + BOOL bNumValid; + BOOL bSubTotal; + BOOL bNextValid; + BOOL bCalcAsShown; + BOOL bTextAsZero; + + BOOL GetThis(double& rValue, USHORT& rErr); public: //UNUSED2008-05 ScValueIterator(ScDocument* pDocument, //UNUSED2008-05 SCCOL nSCol, SCROW nSRow, SCTAB nSTab, @@ -116,11 +116,11 @@ public: ScValueIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE ); - void GetCurNumFmtInfo( short& nType, ULONG& nIndex ); + void GetCurNumFmtInfo( short& nType, ULONG& nIndex ); /// Does NOT reset rValue if no value found! - BOOL GetFirst(double& rValue, USHORT& rErr); + BOOL GetFirst(double& rValue, USHORT& rErr); /// Does NOT reset rValue if no value found! - BOOL GetNext(double& rValue, USHORT& rErr) + BOOL GetNext(double& rValue, USHORT& rErr) { return bNextValid ? ( bNextValid = FALSE, rValue = fNextValue, rErr = 0, nRow = nNextRow, @@ -219,22 +219,22 @@ public: // ============================================================================ class ScCellIterator // alle Zellen in einem Bereich durchgehen -{ // bei SubTotal aber keine ausgeblendeten und -private: // SubTotalZeilen - ScDocument* pDoc; - SCCOL nStartCol; - SCROW nStartRow; - SCTAB nStartTab; - SCCOL nEndCol; - SCROW nEndRow; - SCTAB nEndTab; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCSIZE nColRow; - BOOL bSubTotal; - - ScBaseCell* GetThis(); +{ // bei SubTotal aber keine ausgeblendeten und +private: // SubTotalZeilen + ScDocument* pDoc; + SCCOL nStartCol; + SCROW nStartRow; + SCTAB nStartTab; + SCCOL nEndCol; + SCROW nEndRow; + SCTAB nEndTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCSIZE nColRow; + BOOL bSubTotal; + + ScBaseCell* GetThis(); public: ScCellIterator(ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab, @@ -242,8 +242,8 @@ public: BOOL bSTotal = FALSE); ScCellIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE); - ScBaseCell* GetFirst(); - ScBaseCell* GetNext(); + ScBaseCell* GetFirst(); + ScBaseCell* GetNext(); SCCOL GetCol() const { return nCol; } SCROW GetRow() const { return nRow; } SCTAB GetTab() const { return nTab; } @@ -251,7 +251,7 @@ public: }; class ScQueryCellIterator // alle nichtleeren Zellen in einem Bereich -{ // durchgehen +{ // durchgehen enum StopOnMismatchBits { nStopOnMismatchDisabled = 0x00, @@ -269,21 +269,21 @@ class ScQueryCellIterator // alle nichtleeren Zellen in einem Bereich }; private: - ScQueryParam aParam; - ScDocument* pDoc; - const ScAttrArray* pAttrArray; - ULONG nNumFormat; - SCTAB nTab; - SCCOL nCol; - SCROW nRow; - SCSIZE nColRow; - SCROW nAttrEndRow; + ScQueryParam aParam; + ScDocument* pDoc; + const ScAttrArray* pAttrArray; + ULONG nNumFormat; + SCTAB nTab; + SCCOL nCol; + SCROW nRow; + SCSIZE nColRow; + SCROW nAttrEndRow; BYTE nStopOnMismatch; BYTE nTestEqualCondition; - BOOL bAdvanceQuery; + BOOL bAdvanceQuery; BOOL bIgnoreMismatchOnLeadingStrings; - ScBaseCell* GetThis(); + ScBaseCell* GetThis(); /* Only works if no regular expression is involved, only searches for rows in one column, and only the first @@ -301,16 +301,16 @@ public: const ScQueryParam& aParam, BOOL bMod = TRUE); // fuer bMod = FALSE muss der QueryParam // weiter aufgefuellt sein (bIsString) - ScBaseCell* GetFirst(); - ScBaseCell* GetNext(); + ScBaseCell* GetFirst(); + ScBaseCell* GetNext(); SCCOL GetCol() { return nCol; } SCROW GetRow() { return nRow; } // setzt alle Entry.nField einen weiter, wenn Spalte // wechselt, fuer ScInterpreter ScHLookup() - void SetAdvanceQueryParamEntryField( BOOL bVal ) + void SetAdvanceQueryParamEntryField( BOOL bVal ) { bAdvanceQuery = bVal; } - void AdvanceQueryParamEntryField(); + void AdvanceQueryParamEntryField(); /** If set, iterator stops on first non-matching cell content. May be used in SC_LESS_EQUAL queries where a @@ -376,141 +376,141 @@ public: BOOL bIgnoreMismatchOnLeadingStrings = TRUE ); }; -class ScDocAttrIterator // alle Attribut-Bereiche +class ScDocAttrIterator // alle Attribut-Bereiche { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nEndCol; - SCROW nStartRow; - SCROW nEndRow; - SCCOL nCol; - ScAttrIterator* pColIter; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nEndCol; + SCROW nStartRow; + SCROW nEndRow; + SCCOL nCol; + ScAttrIterator* pColIter; public: ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScDocAttrIterator(); - const ScPatternAttr* GetNext( SCCOL& rCol, SCROW& rRow1, SCROW& rRow2 ); + const ScPatternAttr* GetNext( SCCOL& rCol, SCROW& rRow1, SCROW& rRow2 ); }; -class ScAttrRectIterator // alle Attribut-Bereiche, auch Bereiche ueber mehrere Spalten +class ScAttrRectIterator // alle Attribut-Bereiche, auch Bereiche ueber mehrere Spalten { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nEndCol; - SCROW nStartRow; - SCROW nEndRow; - SCCOL nIterStartCol; - SCCOL nIterEndCol; - ScAttrIterator* pColIter; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nEndCol; + SCROW nStartRow; + SCROW nEndRow; + SCCOL nIterStartCol; + SCCOL nIterEndCol; + ScAttrIterator* pColIter; public: ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScAttrRectIterator(); - void DataChanged(); - const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow1, SCROW& rRow2 ); + void DataChanged(); + const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow1, SCROW& rRow2 ); }; -class ScHorizontalCellIterator // alle nichtleeren Zellen in einem Bereich -{ // zeilenweise durchgehen +class ScHorizontalCellIterator // alle nichtleeren Zellen in einem Bereich +{ // zeilenweise durchgehen private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nStartCol; - SCCOL nEndCol; - SCROW nEndRow; - SCROW* pNextRows; - SCSIZE* pNextIndices; - SCCOL nCol; - SCROW nRow; - BOOL bMore; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nStartCol; + SCCOL nEndCol; + SCROW nEndRow; + SCROW* pNextRows; + SCSIZE* pNextIndices; + SCCOL nCol; + SCROW nRow; + BOOL bMore; public: ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScHorizontalCellIterator(); - ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); - BOOL ReturnNext( SCCOL& rCol, SCROW& rRow ); + ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); + BOOL ReturnNext( SCCOL& rCol, SCROW& rRow ); private: - void Advance(); + void Advance(); }; // -// gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal) +// gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal) // class ScHorizontalAttrIterator { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - - SCROW* pNextEnd; - SCSIZE* pIndices; - const ScPatternAttr** ppPatterns; - SCCOL nCol; - SCROW nRow; - BOOL bRowEmpty; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + + SCROW* pNextEnd; + SCSIZE* pIndices; + const ScPatternAttr** ppPatterns; + SCCOL nCol; + SCROW nRow; + BOOL bRowEmpty; public: ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScHorizontalAttrIterator(); - const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); + const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); }; // -// gibt nichtleere Zellen und Bereiche mit Formatierung zurueck (horizontal) +// gibt nichtleere Zellen und Bereiche mit Formatierung zurueck (horizontal) // class SC_DLLPUBLIC ScUsedAreaIterator { private: - ScHorizontalCellIterator aCellIter; - ScHorizontalAttrIterator aAttrIter; - - SCCOL nNextCol; - SCROW nNextRow; - - SCCOL nCellCol; - SCROW nCellRow; - const ScBaseCell* pCell; - SCCOL nAttrCol1; - SCCOL nAttrCol2; - SCROW nAttrRow; - const ScPatternAttr* pPattern; - - SCCOL nFoundStartCol; // Ergebnisse nach GetNext - SCCOL nFoundEndCol; - SCROW nFoundRow; - const ScPatternAttr* pFoundPattern; - const ScBaseCell* pFoundCell; + ScHorizontalCellIterator aCellIter; + ScHorizontalAttrIterator aAttrIter; + + SCCOL nNextCol; + SCROW nNextRow; + + SCCOL nCellCol; + SCROW nCellRow; + const ScBaseCell* pCell; + SCCOL nAttrCol1; + SCCOL nAttrCol2; + SCROW nAttrRow; + const ScPatternAttr* pPattern; + + SCCOL nFoundStartCol; // Ergebnisse nach GetNext + SCCOL nFoundEndCol; + SCROW nFoundRow; + const ScPatternAttr* pFoundPattern; + const ScBaseCell* pFoundCell; public: ScUsedAreaIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScUsedAreaIterator(); - BOOL GetNext(); + BOOL GetNext(); - SCCOL GetStartCol() const { return nFoundStartCol; } - SCCOL GetEndCol() const { return nFoundEndCol; } - SCROW GetRow() const { return nFoundRow; } - const ScPatternAttr* GetPattern() const { return pFoundPattern; } - const ScBaseCell* GetCell() const { return pFoundCell; } + SCCOL GetStartCol() const { return nFoundStartCol; } + SCCOL GetEndCol() const { return nFoundEndCol; } + SCROW GetRow() const { return nFoundRow; } + const ScPatternAttr* GetPattern() const { return pFoundPattern; } + const ScBaseCell* GetCell() const { return pFoundCell; } }; // ============================================================================ @@ -523,7 +523,7 @@ public: explicit ScRowBreakIterator(::std::set& rBreaks); SCROW first(); SCROW next(); - + private: ::std::set& mrBreaks; ::std::set::const_iterator maItr; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 6f6d4c859a5c..c6489789899f 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -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 @@ -36,20 +36,20 @@ class SC_DLLPUBLIC ScDocOptions { - double fIterEps; // Epsilon-Wert dazu - USHORT nIterCount; // Anzahl + double fIterEps; // Epsilon-Wert dazu + USHORT nIterCount; // Anzahl sal_uInt16 nPrecStandardFormat; // precision for standard format - USHORT nDay; // Nulldatum: + USHORT nDay; // Nulldatum: USHORT nMonth; USHORT nYear; - USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird - USHORT nTabDistance; // Abstand Standardtabulatoren - BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen - BOOL bIsIter; // Iteration bei cirk. Ref - BOOL bCalcAsShown; // berechnen wie angezeigt (Precision) - BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen - BOOL bDoAutoSpell; // Auto-Spelling - BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen + USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird + USHORT nTabDistance; // Abstand Standardtabulatoren + BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen + BOOL bIsIter; // Iteration bei cirk. Ref + BOOL bCalcAsShown; // berechnen wie angezeigt (Precision) + BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen + BOOL bDoAutoSpell; // Auto-Spelling + BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled public: @@ -57,20 +57,20 @@ public: ScDocOptions( const ScDocOptions& rCpy ); ~ScDocOptions(); - BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; } + BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; } void SetLookUpColRowNames( BOOL bVal ) { bLookUpColRowNames = bVal; } - BOOL IsAutoSpell() const { return bDoAutoSpell; } - void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; } - BOOL IsMatchWholeCell() const { return bMatchWholeCell; } + BOOL IsAutoSpell() const { return bDoAutoSpell; } + void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; } + BOOL IsMatchWholeCell() const { return bMatchWholeCell; } void SetMatchWholeCell( BOOL bVal ){ bMatchWholeCell = bVal; } - BOOL IsIgnoreCase() const { return bIsIgnoreCase; } - void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; } - BOOL IsIter() const { return bIsIter; } - void SetIter( BOOL bVal ) { bIsIter = bVal; } - USHORT GetIterCount() const { return nIterCount; } + BOOL IsIgnoreCase() const { return bIsIgnoreCase; } + void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; } + BOOL IsIter() const { return bIsIter; } + void SetIter( BOOL bVal ) { bIsIter = bVal; } + USHORT GetIterCount() const { return nIterCount; } void SetIterCount( USHORT nCount) { nIterCount = nCount; } - double GetIterEps() const { return fIterEps; } - void SetIterEps( double fEps ) { fIterEps = fEps; } + double GetIterEps() const { return fIterEps; } + void SetIterEps( double fEps ) { fIterEps = fEps; } void GetDate( USHORT& rD, USHORT& rM, USHORT& rY ) const { rD = nDay; rM = nMonth; rY = nYear;} @@ -79,21 +79,21 @@ public: USHORT GetTabDistance() const { return nTabDistance;} void SetTabDistance( USHORT nTabDist ) {nTabDistance = nTabDist;} - void ResetDocOptions(); - inline void CopyTo(ScDocOptions& rOpt); + void ResetDocOptions(); + inline void CopyTo(ScDocOptions& rOpt); - inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); - inline int operator==( const ScDocOptions& rOpt ) const; - inline int operator!=( const ScDocOptions& rOpt ) const; + inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); + inline int operator==( const ScDocOptions& rOpt ) const; + inline int operator!=( const ScDocOptions& rOpt ) const; sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; } void SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; } - BOOL IsCalcAsShown() const { return bCalcAsShown; } - void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; } + BOOL IsCalcAsShown() const { return bCalcAsShown; } + void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; } - void SetYear2000( USHORT nVal ) { nYear2000 = nVal; } - USHORT GetYear2000() const { return nYear2000; } + void SetYear2000( USHORT nVal ) { nYear2000 = nVal; } + USHORT GetYear2000() const { return nYear2000; } void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; } BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; } @@ -102,39 +102,39 @@ public: inline void ScDocOptions::CopyTo(ScDocOptions& rOpt) { - rOpt.bIsIgnoreCase = bIsIgnoreCase; - rOpt.bIsIter = bIsIter; - rOpt.nIterCount = nIterCount; - rOpt.fIterEps = fIterEps; - rOpt.nPrecStandardFormat = nPrecStandardFormat; - rOpt.nDay = nDay; - rOpt.nMonth = nMonth; - rOpt.nYear2000 = nYear2000; - rOpt.nYear = nYear; - rOpt.nTabDistance = nTabDistance; - rOpt.bCalcAsShown = bCalcAsShown; - rOpt.bMatchWholeCell = bMatchWholeCell; - rOpt.bDoAutoSpell = bDoAutoSpell; - rOpt.bLookUpColRowNames = bLookUpColRowNames; + rOpt.bIsIgnoreCase = bIsIgnoreCase; + rOpt.bIsIter = bIsIter; + rOpt.nIterCount = nIterCount; + rOpt.fIterEps = fIterEps; + rOpt.nPrecStandardFormat = nPrecStandardFormat; + rOpt.nDay = nDay; + rOpt.nMonth = nMonth; + rOpt.nYear2000 = nYear2000; + rOpt.nYear = nYear; + rOpt.nTabDistance = nTabDistance; + rOpt.bCalcAsShown = bCalcAsShown; + rOpt.bMatchWholeCell = bMatchWholeCell; + rOpt.bDoAutoSpell = bDoAutoSpell; + rOpt.bLookUpColRowNames = bLookUpColRowNames; rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled; } inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) { - bIsIgnoreCase = rCpy.bIsIgnoreCase; - bIsIter = rCpy.bIsIter; - nIterCount = rCpy.nIterCount; - fIterEps = rCpy.fIterEps; + bIsIgnoreCase = rCpy.bIsIgnoreCase; + bIsIter = rCpy.bIsIter; + nIterCount = rCpy.nIterCount; + fIterEps = rCpy.fIterEps; nPrecStandardFormat = rCpy.nPrecStandardFormat; - nDay = rCpy.nDay; - nMonth = rCpy.nMonth; - nYear = rCpy.nYear; - nYear2000 = rCpy.nYear2000; - nTabDistance = rCpy.nTabDistance; - bCalcAsShown = rCpy.bCalcAsShown; - bMatchWholeCell = rCpy.bMatchWholeCell; - bDoAutoSpell = rCpy.bDoAutoSpell; - bLookUpColRowNames = rCpy.bLookUpColRowNames; + nDay = rCpy.nDay; + nMonth = rCpy.nMonth; + nYear = rCpy.nYear; + nYear2000 = rCpy.nYear2000; + nTabDistance = rCpy.nTabDistance; + bCalcAsShown = rCpy.bCalcAsShown; + bMatchWholeCell = rCpy.bMatchWholeCell; + bDoAutoSpell = rCpy.bDoAutoSpell; + bLookUpColRowNames = rCpy.bLookUpColRowNames; bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled; return *this; @@ -143,20 +143,20 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const { return ( - rOpt.bIsIgnoreCase == bIsIgnoreCase - && rOpt.bIsIter == bIsIter - && rOpt.nIterCount == nIterCount - && rOpt.fIterEps == fIterEps - && rOpt.nPrecStandardFormat == nPrecStandardFormat - && rOpt.nDay == nDay - && rOpt.nMonth == nMonth - && rOpt.nYear == nYear - && rOpt.nYear2000 == nYear2000 - && rOpt.nTabDistance == nTabDistance - && rOpt.bCalcAsShown == bCalcAsShown - && rOpt.bMatchWholeCell == bMatchWholeCell - && rOpt.bDoAutoSpell == bDoAutoSpell - && rOpt.bLookUpColRowNames == bLookUpColRowNames + rOpt.bIsIgnoreCase == bIsIgnoreCase + && rOpt.bIsIter == bIsIter + && rOpt.nIterCount == nIterCount + && rOpt.fIterEps == fIterEps + && rOpt.nPrecStandardFormat == nPrecStandardFormat + && rOpt.nDay == nDay + && rOpt.nMonth == nMonth + && rOpt.nYear == nYear + && rOpt.nYear2000 == nYear2000 + && rOpt.nTabDistance == nTabDistance + && rOpt.bCalcAsShown == bCalcAsShown + && rOpt.bMatchWholeCell == bMatchWholeCell + && rOpt.bDoAutoSpell == bDoAutoSpell + && rOpt.bLookUpColRowNames == bLookUpColRowNames && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled ); } @@ -184,20 +184,20 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScDocOptions& GetDocOptions() const { return theOptions; } + const ScDocOptions& GetDocOptions() const { return theOptions; } private: ScDocOptions theOptions; }; //================================================================== -// Config Item containing document options +// Config Item containing document options //================================================================== class ScDocCfg : public ScDocOptions { - ScLinkConfigItem aCalcItem; - ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aCalcItem; + ScLinkConfigItem aLayoutItem; DECL_LINK( CalcCommitHdl, void* ); DECL_LINK( LayoutCommitHdl, void* ); @@ -208,7 +208,7 @@ class ScDocCfg : public ScDocOptions public: ScDocCfg(); - void SetOptions( const ScDocOptions& rNew ); + void SetOptions( const ScDocOptions& rNew ); }; diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 59bd70592725..353dd4044621 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -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 @@ -37,17 +37,17 @@ class ScStyleSheet; class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool { - SfxPoolItem** ppPoolDefaults; - SfxItemPool* pSecondary; - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; - static USHORT* pVersionMap7; - static USHORT* pVersionMap8; - static USHORT* pVersionMap9; + SfxPoolItem** ppPoolDefaults; + SfxItemPool* pSecondary; + static USHORT* pVersionMap1; + static USHORT* pVersionMap2; + static USHORT* pVersionMap3; + static USHORT* pVersionMap4; + static USHORT* pVersionMap5; + static USHORT* pVersionMap6; + static USHORT* pVersionMap7; + static USHORT* pVersionMap8; + static USHORT* pVersionMap9; static USHORT* pVersionMap10; static USHORT* pVersionMap11; @@ -57,24 +57,24 @@ protected: virtual ~ScDocumentPool(); public: - virtual SfxItemPool* Clone() const; - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxItemPool* Clone() const; + virtual SfxMapUnit GetMetric( USHORT nWhich ) const; - virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); - virtual void Remove( const SfxPoolItem& ); - static void CheckRef( const SfxPoolItem& ); + virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); + virtual void Remove( const SfxPoolItem& ); + static void CheckRef( const SfxPoolItem& ); - void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer + void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer void CellStyleCreated( const String& rName ); - virtual SfxItemPresentation GetPresentation( - const SfxPoolItem& rItem, + virtual SfxItemPresentation GetPresentation( + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl = 0 ) const; - static void InitVersionMaps(); - static void DeleteVersionMaps(); + static void InitVersionMaps(); + static void DeleteVersionMaps(); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5c4685223281..82ddefbaa634 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -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 @@ -34,7 +34,7 @@ #include #include #include "scdllapi.h" -#include "table.hxx" // FastGetRowHeight (inline) +#include "table.hxx" // FastGetRowHeight (inline) #include "rangelst.hxx" #include "brdcst.hxx" #include "tabopparams.hxx" @@ -143,7 +143,7 @@ class ScLookupCache; struct ScLookupCacheMapImpl; class SfxUndoManager; class ScFormulaParserPool; -struct ScClipParam; +struct ScClipParam; struct ScClipRangeNameData; class ScRowBreakIterator; @@ -179,14 +179,14 @@ typedef Table SvNumberFormatterIndexTable; #endif */ -#define SC_DOC_NEW 0xFFFF +#define SC_DOC_NEW 0xFFFF -#define SC_MACROCALL_ALLOWED 0 -#define SC_MACROCALL_NOTALLOWED 1 -#define SC_MACROCALL_ASK 2 +#define SC_MACROCALL_ALLOWED 0 +#define SC_MACROCALL_NOTALLOWED 1 +#define SC_MACROCALL_ASK 2 -#define SC_ASIANCOMPRESSION_INVALID 0xff -#define SC_ASIANKERNING_INVALID 0xff +#define SC_ASIANCOMPRESSION_INVALID 0xff +#define SC_ASIANKERNING_INVALID 0xff enum ScDocumentMode @@ -199,22 +199,22 @@ enum ScDocumentMode struct ScDocStat { - String aDocName; - SCTAB nTableCount; - ULONG nCellCount; - USHORT nPageCount; + String aDocName; + SCTAB nTableCount; + ULONG nCellCount; + USHORT nPageCount; }; // The constant parameters to CopyBlockFromClip struct ScCopyBlockFromClipParams { - ScDocument* pRefUndoDoc; - ScDocument* pClipDoc; - USHORT nInsFlag; - SCTAB nTabStart; - SCTAB nTabEnd; - BOOL bAsLink; - BOOL bSkipAttrForEmpty; + ScDocument* pRefUndoDoc; + ScDocument* pClipDoc; + USHORT nInsFlag; + SCTAB nTabStart; + SCTAB nTabEnd; + BOOL bAsLink; + BOOL bSkipAttrForEmpty; }; @@ -255,50 +255,50 @@ private: vos::ORef xPoolHelper; - SfxUndoManager* mpUndoManager; - ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper - ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper - SfxItemPool* pNoteItemPool; // SfxItemPool to be used if pDrawLayer not created. - SfxObjectShell* pShell; - SfxPrinter* pPrinter; - VirtualDevice* pVirtualDevice_100th_mm; - ScDrawLayer* pDrawLayer; // SdrModel - XColorTable* pColorTable; - ScConditionalFormatList* pCondFormList; // bedingte Formate - ScValidationDataList* pValidationList; // Gueltigkeit - SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten - ScTable* pTab[MAXTABCOUNT]; - ScRangeName* pRangeName; - ScDBCollection* pDBCollection; - ScDPCollection* pDPCollection; + SfxUndoManager* mpUndoManager; + ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper + ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper + SfxItemPool* pNoteItemPool; // SfxItemPool to be used if pDrawLayer not created. + SfxObjectShell* pShell; + SfxPrinter* pPrinter; + VirtualDevice* pVirtualDevice_100th_mm; + ScDrawLayer* pDrawLayer; // SdrModel + XColorTable* pColorTable; + ScConditionalFormatList* pCondFormList; // bedingte Formate + ScValidationDataList* pValidationList; // Gueltigkeit + SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten + ScTable* pTab[MAXTABCOUNT]; + ScRangeName* pRangeName; + ScDBCollection* pDBCollection; + ScDPCollection* pDPCollection; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - std::list m_listDPObjectsInClip; + std::list m_listDPObjectsInClip; std::list m_listDPObjectsCaches; // End Comments - ScChartCollection* pChartCollection; + ScChartCollection* pChartCollection; std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; - ScPatternAttr* pSelectionAttr; // Attribute eines Blocks - mutable sfx2::LinkManager* pLinkManager; - ScFormulaCell* pFormulaTree; // Berechnungsbaum Start - ScFormulaCell* pEOFormulaTree; // Berechnungsbaum Ende, letzte Zelle - ScFormulaCell* pFormulaTrack; // BroadcastTrack Start - ScFormulaCell* pEOFormulaTrack; // BrodcastTrack Ende, letzte Zelle - ScBroadcastAreaSlotMachine* pBASM; // BroadcastAreas + ScPatternAttr* pSelectionAttr; // Attribute eines Blocks + mutable sfx2::LinkManager* pLinkManager; + ScFormulaCell* pFormulaTree; // Berechnungsbaum Start + ScFormulaCell* pEOFormulaTree; // Berechnungsbaum Ende, letzte Zelle + ScFormulaCell* pFormulaTrack; // BroadcastTrack Start + ScFormulaCell* pEOFormulaTrack; // BrodcastTrack Ende, letzte Zelle + ScBroadcastAreaSlotMachine* pBASM; // BroadcastAreas ScChartListenerCollection* pChartListenerCollection; - ScStrCollection* pOtherObjects; // non-chart OLE objects - SvMemoryStream* pClipData; - ScDetOpList* pDetOpList; - ScChangeTrack* pChangeTrack; - SfxBroadcaster* pUnoBroadcaster; - ScUnoListenerCalls* pUnoListenerCalls; + ScStrCollection* pOtherObjects; // non-chart OLE objects + SvMemoryStream* pClipData; + ScDetOpList* pDetOpList; + ScChangeTrack* pChangeTrack; + SfxBroadcaster* pUnoBroadcaster; + ScUnoListenerCalls* pUnoListenerCalls; ScUnoRefList* pUnoRefUndoList; ScChangeViewSettings* pChangeViewSettings; - ScScriptTypeData* pScriptTypeData; + ScScriptTypeData* pScriptTypeData; ScRefreshTimerControl* pRefreshTimerControl; vos::ORef xForbiddenCharacters; - ScFieldEditEngine* pCacheFieldEditEngine; + ScFieldEditEngine* pCacheFieldEditEngine; ::std::auto_ptr pDocProtection; ::std::auto_ptr mpClipParam; @@ -311,13 +311,13 @@ private: String aDocName; // opt: Dokumentname String aDocCodeName; // opt: Dokumentname - ScRangePairListRef xColNameRanges; - ScRangePairListRef xRowNameRanges; + ScRangePairListRef xColNameRanges; + ScRangePairListRef xRowNameRanges; - ScViewOptions* pViewOptions; // View-Optionen - ScDocOptions* pDocOptions; // Dokument-Optionen - ScExtDocOptions* pExtDocOptions; // fuer Import etc. - ScConsolidateParam* pConsolidateDlgData; + ScViewOptions* pViewOptions; // View-Optionen + ScDocOptions* pDocOptions; // Dokument-Optionen + ScExtDocOptions* pExtDocOptions; // fuer Import etc. + ScConsolidateParam* pConsolidateDlgData; ScRecursionHelper* pRecursionHelper; // information for recursive and iterative cell formulas @@ -329,26 +329,26 @@ private: sal_uInt32 nRangeOverflowType; // used in (xml) loading for overflow warnings - ScRange aEmbedRange; - ScAddress aCurTextWidthCalcPos; - ScAddress aOnlineSpellPos; // within whole document - ScRange aVisSpellRange; - ScAddress aVisSpellPos; // within aVisSpellRange (see nVisSpellState) + ScRange aEmbedRange; + ScAddress aCurTextWidthCalcPos; + ScAddress aOnlineSpellPos; // within whole document + ScRange aVisSpellRange; + ScAddress aVisSpellPos; // within aVisSpellRange (see nVisSpellState) - Timer aTrackTimer; + Timer aTrackTimer; com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents; public: - ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use + ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use ScInterpreterTableOpParams aLastTableOpParams; // remember last params private: - LanguageType eLanguage; // default language - LanguageType eCjkLanguage; // default language for asian text - LanguageType eCtlLanguage; // default language for complex text - CharSet eSrcSet; // Einlesen: Quell-Zeichensatz + LanguageType eLanguage; // default language + LanguageType eCjkLanguage; // default language for asian text + LanguageType eCtlLanguage; // default language for complex text + CharSet eSrcSet; // Einlesen: Quell-Zeichensatz /** The compiler grammar used in document storage. GRAM_PODF for ODF 1.1 documents, GRAM_ODFF for ODF 1.2 documents. */ @@ -359,74 +359,74 @@ private: importer. */ formula::FormulaGrammar::Grammar eXmlImportGrammar; - ULONG nFormulaCodeInTree; // FormelRPN im Formelbaum + ULONG nFormulaCodeInTree; // FormelRPN im Formelbaum ULONG nXMLImportedFormulaCount; // progress count during XML import - USHORT nInterpretLevel; // >0 wenn im Interpreter - USHORT nMacroInterpretLevel; // >0 wenn Macro im Interpreter - USHORT nInterpreterTableOpLevel; // >0 if in Interpreter TableOp - SCTAB nMaxTableNumber; - USHORT nSrcVer; // Dateiversion (Laden/Speichern) - SCROW nSrcMaxRow; // Zeilenzahl zum Laden/Speichern - USHORT nFormulaTrackCount; - USHORT nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard - SCTAB nVisibleTab; // fuer OLE etc. - - ScLkUpdMode eLinkMode; - - BOOL bAutoCalc; // Automatisch Berechnen - BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled + USHORT nInterpretLevel; // >0 wenn im Interpreter + USHORT nMacroInterpretLevel; // >0 wenn Macro im Interpreter + USHORT nInterpreterTableOpLevel; // >0 if in Interpreter TableOp + SCTAB nMaxTableNumber; + USHORT nSrcVer; // Dateiversion (Laden/Speichern) + SCROW nSrcMaxRow; // Zeilenzahl zum Laden/Speichern + USHORT nFormulaTrackCount; + USHORT nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard + SCTAB nVisibleTab; // fuer OLE etc. + + ScLkUpdMode eLinkMode; + + BOOL bAutoCalc; // Automatisch Berechnen + BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled // ob noch ForcedFormulas berechnet werden muessen, // im Zusammenspiel mit ScDocShell SetDocumentModified, // AutoCalcShellDisabled und TrackFormulas - BOOL bForcedFormulaPending; - BOOL bCalculatingFormulaTree; - BOOL bIsClip; - BOOL bIsUndo; - BOOL bIsVisible; // set from view ctor + BOOL bForcedFormulaPending; + BOOL bCalculatingFormulaTree; + BOOL bIsClip; + BOOL bIsUndo; + BOOL bIsVisible; // set from view ctor - BOOL bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? + BOOL bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? // kein SetDirty bei ScFormulaCell::CompileTokenArray sondern am Ende // von ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip - BOOL bNoSetDirty; + BOOL bNoSetDirty; // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad - BOOL bInsertingFromOtherDoc; + BOOL bInsertingFromOtherDoc; bool bLoadingMedium; bool bImportingXML; // special handling of formula text BOOL bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component - BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE + BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE // wenn temporaer keine Listener auf/abgebaut werden sollen - BOOL bNoListening; - BOOL bIdleDisabled; - BOOL bInLinkUpdate; // TableLink or AreaLink - BOOL bChartListenerCollectionNeedsUpdate; + BOOL bNoListening; + BOOL bIdleDisabled; + BOOL bInLinkUpdate; // TableLink or AreaLink + BOOL bChartListenerCollectionNeedsUpdate; // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an) - BOOL bHasForcedFormulas; + BOOL bHasForcedFormulas; // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr) - BOOL bInDtorClear; + BOOL bInDtorClear; // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz // erweitert wird, wird in jedem UpdateReference aus InputOptions geholt, // gesetzt und am Ende von UpdateReference zurueckgesetzt - BOOL bExpandRefs; + BOOL bExpandRefs; // fuer Detektiv-Update, wird bei jeder Aenderung an Formeln gesetzt - BOOL bDetectiveDirty; + BOOL bDetectiveDirty; - BYTE nMacroCallMode; // Makros per Warnung-Dialog disabled? - BOOL bHasMacroFunc; // valid only after loading + BYTE nMacroCallMode; // Makros per Warnung-Dialog disabled? + BOOL bHasMacroFunc; // valid only after loading - BYTE nVisSpellState; + BYTE nVisSpellState; - BYTE nAsianCompression; - BYTE nAsianKerning; + BYTE nAsianCompression; + BYTE nAsianKerning; BOOL bSetDrawDefaults; BOOL bPastingDrawFromOtherDoc; BYTE nInDdeLinkUpdate; // originating DDE links (stacked bool) - BOOL bInUnoBroadcast; - BOOL bInUnoListenerCall; + BOOL bInUnoBroadcast; + BOOL bInUnoListenerCall; formula::FormulaGrammar::Grammar eGrammar; mutable BOOL bStyleSheetUsageInvalid; @@ -440,83 +440,83 @@ private: sal_Int16 mnNamedRangesLockCount; public: - SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen + SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const; - ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet - ULONG GetCodeCount() const; // RPN-Code in Formeln + ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet + ULONG GetCodeCount() const; // RPN-Code in Formeln DECL_LINK( GetUserDefinedColor, USHORT * ); // Numberformatter public: - SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, + SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, SfxObjectShell* pDocShell = NULL ); - SC_DLLPUBLIC ~ScDocument(); + SC_DLLPUBLIC ~ScDocument(); inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > GetServiceManager() const { return xServiceManager; } - SC_DLLPUBLIC const String& GetName() const { return aDocName; } - void SetName( const String& r ) { aDocName = r; } - const String& GetCodeName() const { return aDocCodeName; } - void SetCodeName( const String& r ) { aDocCodeName = r; } + SC_DLLPUBLIC const String& GetName() const { return aDocName; } + void SetName( const String& r ) { aDocName = r; } + const String& GetCodeName() const { return aDocCodeName; } + void SetCodeName( const String& r ) { aDocCodeName = r; } - void GetDocStat( ScDocStat& rDocStat ); + void GetDocStat( ScDocStat& rDocStat ); - SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL ); - XColorTable* GetColorTable(); + SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL ); + XColorTable* GetColorTable(); - SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const; + SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const; - SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const; - SC_DLLPUBLIC void SetDocOptions( const ScDocOptions& rOpt ); - SC_DLLPUBLIC const ScViewOptions& GetViewOptions() const; - SC_DLLPUBLIC void SetViewOptions( const ScViewOptions& rOpt ); - void SetPrintOptions(); + SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const; + SC_DLLPUBLIC void SetDocOptions( const ScDocOptions& rOpt ); + SC_DLLPUBLIC const ScViewOptions& GetViewOptions() const; + SC_DLLPUBLIC void SetViewOptions( const ScViewOptions& rOpt ); + void SetPrintOptions(); - ScExtDocOptions* GetExtDocOptions() { return pExtDocOptions; } - SC_DLLPUBLIC void SetExtDocOptions( ScExtDocOptions* pNewOptions ); + ScExtDocOptions* GetExtDocOptions() { return pExtDocOptions; } + SC_DLLPUBLIC void SetExtDocOptions( ScExtDocOptions* pNewOptions ); - void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const; - void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl ); + void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const; + void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl ); void SetDrawDefaults(); - void SetConsolidateDlgData( const ScConsolidateParam* pData ); - const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData; } + void SetConsolidateDlgData( const ScConsolidateParam* pData ); + const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData; } - void Clear( sal_Bool bFromDestructor = sal_False ); + void Clear( sal_Bool bFromDestructor = sal_False ); - ScFieldEditEngine* CreateFieldEditEngine(); - void DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine); + ScFieldEditEngine* CreateFieldEditEngine(); + void DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine); - SC_DLLPUBLIC ScRangeName* GetRangeName(); - void SetRangeName( ScRangeName* pNewRangeName ); - SCTAB GetMaxTableNumber() { return nMaxTableNumber; } - void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } + SC_DLLPUBLIC ScRangeName* GetRangeName(); + void SetRangeName( ScRangeName* pNewRangeName ); + SCTAB GetMaxTableNumber() { return nMaxTableNumber; } + void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } - ScRangePairList* GetColNameRanges() { return &xColNameRanges; } - ScRangePairList* GetRowNameRanges() { return &xRowNameRanges; } - ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } - ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } + ScRangePairList* GetColNameRanges() { return &xColNameRanges; } + ScRangePairList* GetRowNameRanges() { return &xRowNameRanges; } + ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } + ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } - SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; - void SetDBCollection( ScDBCollection* pNewDBCollection, + SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; + void SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemoveAutoFilter = FALSE ); - ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, + ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly = FALSE) const; - ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; -//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, +//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, //UNUSED2008-05 BOOL bStartOnly = FALSE) const; - SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; + SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; - SC_DLLPUBLIC ScDPCollection* GetDPCollection(); - ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; + SC_DLLPUBLIC ScDPCollection* GetDPCollection(); + ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance SC_DLLPUBLIC ScDPTableDataCache* GetDPObjectCache( long nID ); - SC_DLLPUBLIC ScDPTableDataCache* GetUsedDPObjectCache ( ScRange rRange ); + SC_DLLPUBLIC ScDPTableDataCache* GetUsedDPObjectCache ( ScRange rRange ); SC_DLLPUBLIC long AddDPObjectCache( ScDPTableDataCache* pData ); SC_DLLPUBLIC void RemoveDPObjectCache( long nID ); SC_DLLPUBLIC void RemoveUnusedDPObjectCaches(); @@ -524,22 +524,22 @@ public: SC_DLLPUBLIC long GetNewDPObjectCacheId (); // End Comments - SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; + SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; - void StopTemporaryChartLock(); + void StopTemporaryChartLock(); - void EnsureGraphicNames(); + void EnsureGraphicNames(); - SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); - BOOL HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); + SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); + BOOL HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const String& rChartName ); SC_DLLPUBLIC void GetChartRanges( const String& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); void SetChartRanges( const String& rChartName, const ::std::vector< ScRangeList >& rRanges ); - void UpdateChartArea( const String& rChartName, const ScRange& rNewArea, + void UpdateChartArea( const String& rChartName, const ScRange& rNewArea, BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); - void UpdateChartArea( const String& rChartName, + void UpdateChartArea( const String& rChartName, const ScRangeListRef& rNewList, BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); void GetOldChartParameters( const String& rName, @@ -548,105 +548,105 @@ public: ::com::sun::star::embed::XEmbeddedObject > FindOleObjectByName( const String& rName ); - SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); + SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); - SCTAB GetVisibleTab() const { return nVisibleTab; } - SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } + SCTAB GetVisibleTab() const { return nVisibleTab; } + SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } - SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; - SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, String& rName ); - SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; - SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } + SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, String& rName ); + SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; + SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; } SC_DLLPUBLIC ScDocProtection* GetDocProtection() const; SC_DLLPUBLIC void SetDocProtection(const ScDocProtection* pProtect); - SC_DLLPUBLIC BOOL IsDocProtected() const; - BOOL IsDocEditable() const; - SC_DLLPUBLIC BOOL IsTabProtected( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL IsDocProtected() const; + BOOL IsDocEditable() const; + SC_DLLPUBLIC BOOL IsTabProtected( SCTAB nTab ) const; SC_DLLPUBLIC ScTableProtection* GetTabProtection( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect); void CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest); - void LockTable(SCTAB nTab); - void UnlockTable(SCTAB nTab); + void LockTable(SCTAB nTab); + void UnlockTable(SCTAB nTab); - BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, + BOOL IsSelectionEditable( const ScMarkData& rMark, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, + BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const; - BOOL GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); + BOOL GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); - BOOL IsEmbedded() const; - void GetEmbedded( ScRange& rRange ) const; - void SetEmbedded( const ScRange& rRange ); - void ResetEmbedded(); - Rectangle GetEmbeddedRect() const; // 1/100 mm - void SetEmbedded( const Rectangle& rRect ); // aus VisArea (1/100 mm) - void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm + BOOL IsEmbedded() const; + void GetEmbedded( ScRange& rRange ) const; + void SetEmbedded( const ScRange& rRange ); + void ResetEmbedded(); + Rectangle GetEmbeddedRect() const; // 1/100 mm + void SetEmbedded( const Rectangle& rRect ); // aus VisArea (1/100 mm) + void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm - SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const; - SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const; - SC_DLLPUBLIC void CreateValidTabName(String& rName) const; - SC_DLLPUBLIC BOOL InsertTab( SCTAB nPos, const String& rName, + SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const; + SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const; + SC_DLLPUBLIC void CreateValidTabName(String& rName) const; + SC_DLLPUBLIC BOOL InsertTab( SCTAB nPos, const String& rName, BOOL bExternalDocument = FALSE ); SC_DLLPUBLIC BOOL DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL ); - SC_DLLPUBLIC BOOL RenameTab( SCTAB nTab, const String& rName, + SC_DLLPUBLIC BOOL RenameTab( SCTAB nTab, const String& rName, BOOL bUpdateRef = TRUE, BOOL bExternalDocument = FALSE ); - BOOL MoveTab( SCTAB nOldPos, SCTAB nNewPos ); - BOOL CopyTab( SCTAB nOldPos, SCTAB nNewPos, + BOOL MoveTab( SCTAB nOldPos, SCTAB nNewPos ); + BOOL CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked = NULL ); - SC_DLLPUBLIC ULONG TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, + SC_DLLPUBLIC ULONG TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew = TRUE, BOOL bResultsOnly = FALSE ); - SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); - SC_DLLPUBLIC void SetVisible( SCTAB nTab, BOOL bVisible ); - SC_DLLPUBLIC BOOL IsVisible( SCTAB nTab ) const; + SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); + SC_DLLPUBLIC void SetVisible( SCTAB nTab, BOOL bVisible ); + SC_DLLPUBLIC BOOL IsVisible( SCTAB nTab ) const; BOOL IsStreamValid( SCTAB nTab ) const; void SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock = FALSE ); void LockStreamValid( bool bLock ); bool IsStreamValidLocked() const { return mbStreamValidLocked; } BOOL IsPendingRowHeights( SCTAB nTab ) const; void SetPendingRowHeights( SCTAB nTab, BOOL bSet ); - SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); - SC_DLLPUBLIC BOOL IsLayoutRTL( SCTAB nTab ) const; - BOOL IsNegativePage( SCTAB nTab ) const; - SC_DLLPUBLIC void SetScenario( SCTAB nTab, BOOL bFlag ); - SC_DLLPUBLIC BOOL IsScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, String& rComment, + SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); + SC_DLLPUBLIC BOOL IsLayoutRTL( SCTAB nTab ) const; + BOOL IsNegativePage( SCTAB nTab ) const; + SC_DLLPUBLIC void SetScenario( SCTAB nTab, BOOL bFlag ); + SC_DLLPUBLIC BOOL IsScenario( SCTAB nTab ) const; + SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, String& rComment, Color& rColor, USHORT& rFlags ) const; - SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment, + SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment, const Color& rColor, USHORT nFlags ); SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor ); SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const; - void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const; - SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc. + void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const; + SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const; + SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc. SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const; SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const; void SetGrammar( formula::FormulaGrammar::Grammar eGram ); - SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const; - BOOL IsLinked( SCTAB nTab ) const; - SC_DLLPUBLIC const String& GetLinkDoc( SCTAB nTab ) const; - const String& GetLinkFlt( SCTAB nTab ) const; - const String& GetLinkOpt( SCTAB nTab ) const; - SC_DLLPUBLIC const String& GetLinkTab( SCTAB nTab ) const; - ULONG GetLinkRefreshDelay( SCTAB nTab ) const; - void SetLink( SCTAB nTab, BYTE nMode, const String& rDoc, + SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const; + BOOL IsLinked( SCTAB nTab ) const; + SC_DLLPUBLIC const String& GetLinkDoc( SCTAB nTab ) const; + const String& GetLinkFlt( SCTAB nTab ) const; + const String& GetLinkOpt( SCTAB nTab ) const; + SC_DLLPUBLIC const String& GetLinkTab( SCTAB nTab ) const; + ULONG GetLinkRefreshDelay( SCTAB nTab ) const; + void SetLink( SCTAB nTab, BYTE nMode, const String& rDoc, const String& rFilter, const String& rOptions, const String& rTabName, ULONG nRefreshDelay ); - BOOL HasLink( const String& rDoc, + BOOL HasLink( const String& rDoc, const String& rFilter, const String& rOptions ) const; - SC_DLLPUBLIC BOOL LinkExternalTab( SCTAB& nTab, const String& aDocTab, + SC_DLLPUBLIC BOOL LinkExternalTab( SCTAB& nTab, const String& aDocTab, const String& aFileName, const String& aTabName ); @@ -660,23 +660,23 @@ public: on first call. */ ScFormulaParserPool& GetFormulaParserPool() const; - BOOL HasDdeLinks() const; - BOOL HasAreaLinks() const; + BOOL HasDdeLinks() const; + BOOL HasAreaLinks() const; void UpdateExternalRefLinks(); - void UpdateDdeLinks(); - void UpdateAreaLinks(); + void UpdateDdeLinks(); + void UpdateAreaLinks(); // originating DDE links void IncInDdeLinkUpdate() { if ( nInDdeLinkUpdate < 255 ) ++nInDdeLinkUpdate; } void DecInDdeLinkUpdate() { if ( nInDdeLinkUpdate ) --nInDdeLinkUpdate; } BOOL IsInDdeLinkUpdate() const { return nInDdeLinkUpdate != 0; } - SC_DLLPUBLIC void CopyDdeLinks( ScDocument* pDestDoc ) const; - void DisconnectDdeLinks(); + SC_DLLPUBLIC void CopyDdeLinks( ScDocument* pDestDoc ) const; + void DisconnectDdeLinks(); // Fuer StarOne Api: - USHORT GetDdeLinkCount() const; - BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); + USHORT GetDdeLinkCount() const; + BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); /** Tries to find a DDE link with the specified connection data. @param rnDdePos (out-param) Returns the index of the DDE link (does not include other links from link manager). @@ -711,11 +711,11 @@ public: bool SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults ); - SfxBindings* GetViewBindings(); - SfxObjectShell* GetDocumentShell() const { return pShell; } - ScDrawLayer* GetDrawLayer() { return pDrawLayer; } - SfxBroadcaster* GetDrawBroadcaster(); // zwecks Header-Vermeidung - void BeginDrawUndo(); + SfxBindings* GetViewBindings(); + SfxObjectShell* GetDocumentShell() const { return pShell; } + ScDrawLayer* GetDrawLayer() { return pDrawLayer; } + SfxBroadcaster* GetDrawBroadcaster(); // zwecks Header-Vermeidung + void BeginDrawUndo(); void BeginUnoRefUndo(); bool HasUnoRefUndo() const { return ( pUnoRefUndoList != NULL ); } @@ -726,22 +726,22 @@ public: // #109985# sal_Bool IsChart( const SdrObject* pObject ); - SC_DLLPUBLIC void UpdateAllCharts(); - void UpdateChartRef( UpdateRefMode eUpdateRefMode, + SC_DLLPUBLIC void UpdateAllCharts(); + void UpdateChartRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); //! setzt nur die neue RangeList, keine ChartListener o.ae. - void SetChartRangeList( const String& rChartName, + void SetChartRangeList( const String& rChartName, const ScRangeListRef& rNewRangeListRef ); - BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); - void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); + void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); - void StartAnimations( SCTAB nTab, Window* pWin ); + void StartAnimations( SCTAB nTab, Window* pWin ); - BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); - BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); const ScSheetEvents* GetSheetEvents( SCTAB nTab ) const; void SetSheetEvents( SCTAB nTab, const ScSheetEvents* pNew ); @@ -752,68 +752,68 @@ public: void SetCalcNotification( SCTAB nTab ); void ResetCalcNotifications(); - SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE ); - BOOL SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); + SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE ); + BOOL SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); - void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, + void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - BOOL DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); - void RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); - BOOL TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); - BOOL HasSubTotalCells( const ScRange& rRange ); + BOOL DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); + void RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); + BOOL TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); + BOOL HasSubTotalCells( const ScRange& rRange ); - SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); -//UNUSED2009-05 SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, + SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); +//UNUSED2009-05 SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, //UNUSED2009-05 ULONG nFormatIndex, BOOL bForceTab = FALSE); - SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, + SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, BOOL bForceTab = FALSE ); - SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, + SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, ULONG nFormatIndex, BOOL bForceTab = FALSE); - // return TRUE = Zahlformat gesetzt + // return TRUE = Zahlformat gesetzt SC_DLLPUBLIC BOOL SetString( - SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); + void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); - SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, + SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, const String& rFormula, const ScTokenArray* p = NULL, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); - SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // Mehrfachoperation + SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // Mehrfachoperation SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark); - SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); - SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); - SC_DLLPUBLIC double GetValue( const ScAddress& ); - SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ); - SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); - SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); + SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); + SC_DLLPUBLIC double GetValue( const ScAddress& ); + SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ); + SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); + SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt32& rFormat ); - SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; + SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; /** If no number format attribute is set and the cell pointer passed is of type formula cell, the calculated number format of the formula cell is returned. pCell may be NULL. */ - SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex, + SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex, const ScAddress& rPos, const ScBaseCell* pCell ) const; - void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula, + void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula, BOOL bAsciiExport = FALSE ) const; - SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; - SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; - SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; - SC_DLLPUBLIC ScBaseCell* GetCell( const ScAddress& rPos ) const; + SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; + SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; + SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; + SC_DLLPUBLIC ScBaseCell* GetCell( const ScAddress& rPos ) const; -//UNUSED2008-05 void RefreshNoteFlags(); +//UNUSED2008-05 void RefreshNoteFlags(); - SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL HasStringCells( const ScRange& rRange ) const; + SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); + SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL HasStringCells( const ScRange& rRange ) const; /** Returns true, if there is any data to create a selection list for rPos. */ BOOL HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; @@ -838,56 +838,56 @@ public: BOOL ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, + BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendTotalMerge( ScRange& rRange ); - SC_DLLPUBLIC BOOL ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, + BOOL ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); + BOOL ExtendTotalMerge( ScRange& rRange ); + SC_DLLPUBLIC BOOL ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL ExtendOverlapped( ScRange& rRange ); + SC_DLLPUBLIC BOOL ExtendOverlapped( ScRange& rRange ); - BOOL RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, + BOOL RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - // ohne Ueberpruefung: - SC_DLLPUBLIC void DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + // ohne Ueberpruefung: + SC_DLLPUBLIC void DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); - void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - BOOL IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - BOOL IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bLeftIsEmpty = FALSE, ScRange* pLastRange = NULL, Rectangle* pLastMM = NULL ) const; - BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask ); SC_DLLPUBLIC bool HasAttrib( const ScRange& rRange, USHORT nMask ); - void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, + void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; - void ResetChanged( const ScRange& rRange ); + void ResetChanged( const ScRange& rRange ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp + void SetDirty(); + void SetDirty( const ScRange& ); + void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp void InterpretDirtyCells( const ScRangeList& rRanges ); - void CalcAll(); - SC_DLLPUBLIC void CalcAfterLoad(); - void CompileAll(); - void CompileXML(); + void CalcAll(); + SC_DLLPUBLIC void CalcAfterLoad(); + void CompileAll(); + void CompileXML(); ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; } @@ -904,22 +904,22 @@ public: void ClearLookupCaches(); // Automatisch Berechnen - void SetAutoCalc( BOOL bNewAutoCalc ); - BOOL GetAutoCalc() const { return bAutoCalc; } + void SetAutoCalc( BOOL bNewAutoCalc ); + BOOL GetAutoCalc() const { return bAutoCalc; } // Automatisch Berechnen in/von/fuer ScDocShell disabled - void SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; } - BOOL IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } + void SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; } + BOOL IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } // ForcedFormulas zu berechnen - void SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; } - BOOL IsForcedFormulaPending() const { return bForcedFormulaPending; } + void SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; } + BOOL IsForcedFormulaPending() const { return bForcedFormulaPending; } // if CalcFormulaTree() is currently running - BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } - - USHORT GetErrCode( const ScAddress& ) const; + BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } + + USHORT GetErrCode( const ScAddress& ) const; /** Shrink a range to only include data area. - This is not the actually used area within the - selection, but the bounds of the sheet's data area + This is not the actually used area within the + selection, but the bounds of the sheet's data area instead. */ bool ShrinkToDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const; @@ -928,77 +928,77 @@ public: void GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const; - SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, + SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, + SC_DLLPUBLIC BOOL GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, SCCOL& rEndCol, BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, + SC_DLLPUBLIC BOOL GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW& rEndRow, BOOL bNotes = TRUE ) const; - void InvalidateTableArea(); + void InvalidateTableArea(); - SC_DLLPUBLIC BOOL GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; + SC_DLLPUBLIC BOOL GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; - /** - * Find the maximum column position that contains printable data for the - * specified row range. The final column position must be equal or less - * than the initial value of rEndCol. + /** + * Find the maximum column position that contains printable data for the + * specified row range. The final column position must be equal or less + * than the initial value of rEndCol. */ - void ExtendPrintArea( OutputDevice* pDev, SCTAB nTab, + void ExtendPrintArea( OutputDevice* pDev, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ); - SC_DLLPUBLIC SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, + SC_DLLPUBLIC SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, ScDirection eDir ); - void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY ); - SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, + void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY ); + SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, + BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, const ScMarkData& rMark ); - void LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, + void LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - void LimitChartIfAll( ScRangeListRef& rRangeList ); + void LimitChartIfAll( ScRangeListRef& rRangeList ); - BOOL InsertRow( SCCOL nStartCol, SCTAB nStartTab, + BOOL InsertRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); - void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, + SC_DLLPUBLIC BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); - void DeleteRow( const ScRange& rRange, + void DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); - BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab, + BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); - void DeleteCol( SCROW nStartRow, SCTAB nStartTab, + SC_DLLPUBLIC BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + void DeleteCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); - void DeleteCol( const ScRange& rRange, + void DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); - BOOL CanInsertRow( const ScRange& rRange ) const; - BOOL CanInsertCol( const ScRange& rRange ) const; + BOOL CanInsertRow( const ScRange& rRange ) const; + BOOL CanInsertCol( const ScRange& rRange ) const; - void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE ); - BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew ); + void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE ); + BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew ); - BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } - BOOL IsUndo() const { return bIsUndo; } - BOOL IsClipboard() const { return bIsClip; } - bool IsUndoEnabled() const { return mbUndoEnabled; } + BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } + BOOL IsUndo() const { return bIsUndo; } + BOOL IsClipboard() const { return bIsClip; } + bool IsUndoEnabled() const { return mbUndoEnabled; } void EnableUndo( bool bVal ); bool IsAdjustHeightEnabled() const { return mbAdjustHeightEnabled; } @@ -1009,49 +1009,49 @@ public: void EnableChangeReadOnly( bool bVal ) { mbChangeReadOnlyEnabled = bVal; } SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const { return mnNamedRangesLockCount; } void SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; } - SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ); - SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, SCTAB nTab ); - void SetCutMode( BOOL bCut ); - BOOL IsCutMode(); - void SetClipArea( const ScRange& rArea, BOOL bCut = FALSE ); + SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ); + SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, SCTAB nTab ); + void SetCutMode( BOOL bCut ); + BOOL IsCutMode(); + void SetClipArea( const ScRange& rArea, BOOL bCut = FALSE ); - SC_DLLPUBLIC BOOL IsDocVisible() const { return bIsVisible; } - void SetDocVisible( BOOL bSet ); + SC_DLLPUBLIC BOOL IsDocVisible() const { return bIsVisible; } + void SetDocVisible( BOOL bSet ); - BOOL HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); + BOOL HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); - void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark ); - void DeleteObjectsInSelection( const ScMarkData& rMark ); + void DeleteObjectsInSelection( const ScMarkData& rMark ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nDelFlag); - void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, USHORT nDelFlag); - void DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag); + void DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag); - void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, + void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false, bool bIncludeObjects = false, bool bCloneNoteCaptions = true); - void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScDocument* pClipDoc = NULL); - void CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP ); - void CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP, SCROW & rClipStartRow ); - void StartListeningFromClip( SCCOL nCol1, SCROW nRow1, + void StartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nInsFlag ); - void BroadcastFromClip( SCCOL nCol1, SCROW nRow1, + void BroadcastFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nInsFlag ); /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ - void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, + void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, USHORT nInsFlag, ScDocument* pRefUndoDoc = NULL, ScDocument* pClipDoc = NULL, @@ -1061,216 +1061,216 @@ public: BOOL bSkipAttrForEmpty = FALSE, const ScRangeList * pDestRanges = NULL ); - void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, - sal_uInt16 nInsFlag, ScDocument* pClipDoc, + void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, + sal_uInt16 nInsFlag, ScDocument* pClipDoc, bool bResetCut = true, bool bAsLink = false, bool bIncludeFiltered = true, bool bSkipAttrForEmpty = false); - void GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered); - void GetClipStart(SCCOL& nClipX, SCROW& nClipY); + void GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered); + void GetClipStart(SCCOL& nClipX, SCROW& nClipY); - BOOL HasClipFilteredRows(); + BOOL HasClipFilteredRows(); - BOOL IsClipboardSource() const; + BOOL IsClipboardSource() const; - SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink ); + SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink ); ScClipParam& GetClipParam(); void SetClipParam(const ScClipParam& rParam); - void MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty, + void MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty, ScDocument* pSrcDoc ); - void FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, + void FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - void FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, + void FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - void TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ); + void TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ); - SC_DLLPUBLIC void InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, + SC_DLLPUBLIC void InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - void AddUndoTab( SCTAB nTab1, SCTAB nTab2, + void AddUndoTab( SCTAB nTab1, SCTAB nTab2, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, + SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - // nicht mehr benutzen: - void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + // nicht mehr benutzen: + void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); - void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); - void CopyToDocument(const ScRange& rRange, + void CopyToDocument(const ScRange& rRange, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); - void UndoToDocument(const ScRange& rRange, + void UndoToDocument(const ScRange& rRange, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); - void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE ); - BOOL TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; - void MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, + void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE ); + BOOL TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; + void MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, ScMarkData& rDestMark, BOOL bResetMark = TRUE, USHORT nNeededBits = 0 ) const; - BOOL HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; + BOOL HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; SC_DLLPUBLIC const ScRangeList* GetScenarioRanges( SCTAB nTab ) const; - SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ); + SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true ); - SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, + SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, const ScMarkData& rMark, ScDocument* pUndoDoc = NULL ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, ULONG nFillCount, FillDir eFillDir = FILL_TO_BOTTOM, FillCmd eFillCmd = FILL_LINEAR, FillDateCmd eFillDateCmd = FILL_DAY, double nStepValue = 1.0, double nMaxValue = 1E307); - String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); + String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - BOOL GetSelectionFunction( ScSubTotalFunc eFunc, + BOOL GetSelectionFunction( ScSubTotalFunc eFunc, const ScAddress& rCursor, const ScMarkData& rMark, double& rResult ); - SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; - SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; - const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); - ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); + const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); + ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); const ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); - BOOL HasStringWeakCharacters( const String& rString ); - SC_DLLPUBLIC BYTE GetStringScriptType( const String& rString ); - SC_DLLPUBLIC BYTE GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ); - SC_DLLPUBLIC BYTE GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); - - BOOL HasDetectiveOperations() const; - void AddDetectiveOperation( const ScDetOpData& rData ); - void ClearDetectiveOperations(); - ScDetOpList* GetDetOpList() const { return pDetOpList; } - void SetDetOpList(ScDetOpList* pNew); - - BOOL HasDetectiveObjects(SCTAB nTab) const; - - void GetSelectionFrame( const ScMarkData& rMark, - SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ); - void ApplySelectionFrame( const ScMarkData& rMark, + BOOL HasStringWeakCharacters( const String& rString ); + SC_DLLPUBLIC BYTE GetStringScriptType( const String& rString ); + SC_DLLPUBLIC BYTE GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ); + SC_DLLPUBLIC BYTE GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); + + BOOL HasDetectiveOperations() const; + void AddDetectiveOperation( const ScDetOpData& rData ); + void ClearDetectiveOperations(); + ScDetOpList* GetDetOpList() const { return pDetOpList; } + void SetDetOpList(ScDetOpList* pNew); + + BOOL HasDetectiveObjects(SCTAB nTab) const; + + void GetSelectionFrame( const ScMarkData& rMark, + SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ); + void ApplySelectionFrame( const ScMarkData& rMark, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ); - void ApplyFrameAreaTab( const ScRange& rRange, + void ApplyFrameAreaTab( const ScRange& rRange, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - SC_DLLPUBLIC ULONG AddCondFormat( const ScConditionalFormat& rNew ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); - void ConditionalChanged( ULONG nKey ); + SC_DLLPUBLIC ULONG AddCondFormat( const ScConditionalFormat& rNew ); + SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); + SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); + void ConditionalChanged( ULONG nKey ); - SC_DLLPUBLIC ULONG AddValidationEntry( const ScValidationData& rNew ); + SC_DLLPUBLIC ULONG AddValidationEntry( const ScValidationData& rNew ); - SC_DLLPUBLIC const ScValidationData* GetValidationEntry( ULONG nIndex ) const; + SC_DLLPUBLIC const ScValidationData* GetValidationEntry( ULONG nIndex ) const; - ScConditionalFormatList* GetCondFormList() const // Ref-Undo + ScConditionalFormatList* GetCondFormList() const // Ref-Undo { return pCondFormList; } - void SetCondFormList(ScConditionalFormatList* pNew); + void SetCondFormList(ScConditionalFormatList* pNew); ScValidationDataList* GetValidationList() const { return pValidationList; } - SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ); - SC_DLLPUBLIC void ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr ); - SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, const ScPatternAttr& rAttr ); - SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScPatternAttr& rAttr ); - SC_DLLPUBLIC void ApplyPatternIfNumberformatIncompatible( + SC_DLLPUBLIC void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScMarkData& rMark, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, + void ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle); - void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, + void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, const ScStyleSheet& rStyle); - SC_DLLPUBLIC void ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScStyleSheet& rStyle); - void ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark ); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark ); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark ) const; + const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - SC_DLLPUBLIC BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); - BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, + BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); - SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr, + SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); - SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, + SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); void DeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount ); - void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, USHORT nFormatNo, const ScMarkData& rMark ); - void GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData ); - BOOL SearchAndReplace( const SvxSearchItem& rSearchItem, + BOOL SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, SCTAB& rTab, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc = NULL ); // Col/Row von Folgeaufrufen bestimmen // (z.B. nicht gefunden von Anfang, oder folgende Tabellen) - static void GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, + static void GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow ); - BOOL Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, + BOOL Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, const String& sValStr, double& nX); - void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark ); + void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab, USHORT nNewWidth ); SC_DLLPUBLIC void SetRowHeight( SCROW nRow, SCTAB nTab, USHORT nNewHeight ); @@ -1293,17 +1293,17 @@ public: SC_DLLPUBLIC USHORT GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const; SC_DLLPUBLIC USHORT GetOriginalHeight( SCROW nRow, SCTAB nTab ) const; - USHORT GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; + USHORT GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; - SCROW GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const; + SCROW GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const; - USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, + USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, const ScMarkData* pMarkData = NULL, BOOL bSimpleTextImport = FALSE ); - SC_DLLPUBLIC BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra, + SC_DLLPUBLIC BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -1312,21 +1312,21 @@ public: double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, const ScMarkData* pTabMark = NULL ); - long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, + long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, BOOL bTotalSize = FALSE ); - SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC BYTE GetColFlags( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC BYTE GetRowFlags( SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC BYTE GetColFlags( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC BYTE GetRowFlags( SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const; SC_DLLPUBLIC ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab ); @@ -1362,15 +1362,15 @@ public: SCROW LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab); SCROW CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab); - /** - * Write all column row flags to table's flag data, because not all column - * row attributes are stored in the flag data members. This is necessary - * for ods export. + /** + * Write all column row flags to table's flag data, because not all column + * row attributes are stored in the flag data members. This is necessary + * for ods export. */ void SyncColRowFlags(); /// @return the index of the last row with any set flags (auto-pagebreak is ignored). - SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; + SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; /// @return the index of the last changed column (flags and column width, auto pagebreak is ignored). SCCOL GetLastChangedCol( SCTAB nTab ) const; @@ -1387,46 +1387,46 @@ public: // returns whether to export a Default style for this col/row or not // nDefault is setted to one possition in the current row/col where the Default style is - BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); - BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); + BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); + BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); + BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); + BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); - void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); - void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); + void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); + void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); - SC_DLLPUBLIC ScPatternAttr* GetDefPattern() const; - SC_DLLPUBLIC ScDocumentPool* GetPool(); - SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; + SC_DLLPUBLIC ScPatternAttr* GetDefPattern() const; + SC_DLLPUBLIC ScDocumentPool* GetPool(); + SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; // PageStyle: - SC_DLLPUBLIC const String& GetPageStyle( SCTAB nTab ) const; - SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const String& rName ); - Size GetPageSize( SCTAB nTab ) const; - void SetPageSize( SCTAB nTab, const Size& rSize ); - void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); + SC_DLLPUBLIC const String& GetPageStyle( SCTAB nTab ) const; + SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const String& rName ); + Size GetPageSize( SCTAB nTab ) const; + void SetPageSize( SCTAB nTab, const Size& rSize ); + void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); void InvalidatePageBreaks(SCTAB nTab); - void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); - void RemoveManualBreaks( SCTAB nTab ); - BOOL HasManualBreaks( SCTAB nTab ) const; + void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); + void RemoveManualBreaks( SCTAB nTab ); + BOOL HasManualBreaks( SCTAB nTab ) const; - BOOL IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); - BOOL RemovePageStyleInUse( const String& rStrPageStyle ); - BOOL RenamePageStyleInUse( const String& rOld, const String& rNew ); - void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, - const SfxItemSet& rChanges ); + BOOL IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); + BOOL RemovePageStyleInUse( const String& rStrPageStyle ); + BOOL RenamePageStyleInUse( const String& rOld, const String& rNew ); + void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, + const SfxItemSet& rChanges ); - void PageStyleModified( SCTAB nTab, const String& rNewName ); + void PageStyleModified( SCTAB nTab, const String& rNewName ); - SC_DLLPUBLIC BOOL NeedPageResetAfterTab( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL NeedPageResetAfterTab( SCTAB nTab ) const; // war vorher im PageStyle untergracht. Jetzt an jeder Tabelle: - SC_DLLPUBLIC BOOL HasPrintRange(); - SC_DLLPUBLIC USHORT GetPrintRangeCount( SCTAB nTab ); - SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, USHORT nPos ); - SC_DLLPUBLIC const ScRange* GetRepeatColRange( SCTAB nTab ); - SC_DLLPUBLIC const ScRange* GetRepeatRowRange( SCTAB nTab ); + SC_DLLPUBLIC BOOL HasPrintRange(); + SC_DLLPUBLIC USHORT GetPrintRangeCount( SCTAB nTab ); + SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, USHORT nPos ); + SC_DLLPUBLIC const ScRange* GetRepeatColRange( SCTAB nTab ); + SC_DLLPUBLIC const ScRange* GetRepeatRowRange( SCTAB nTab ); /** Returns true, if the specified sheet is always printed. */ BOOL IsPrintEntireSheet( SCTAB nTab ) const; @@ -1438,171 +1438,171 @@ public: //UNUSED2009-05 void SetPrintRange( SCTAB nTab, const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges on the sheet! */ SC_DLLPUBLIC void SetPrintEntireSheet( SCTAB nTab ); - SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); - SC_DLLPUBLIC void SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ); + SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); + SC_DLLPUBLIC void SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ); ScPrintRangeSaver* CreatePrintRangeSaver() const; - void RestorePrintRanges( const ScPrintRangeSaver& rSaver ); + void RestorePrintRanges( const ScPrintRangeSaver& rSaver ); - SC_DLLPUBLIC Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect ); + SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect ); - void UpdStlShtPtrsFrmNms(); - void StylesToNames(); + void UpdStlShtPtrsFrmNms(); + void StylesToNames(); - SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); + SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); - CharSet GetSrcCharSet() const { return eSrcSet; } - ULONG GetSrcVersion() const { return nSrcVer; } - SCROW GetSrcMaxRow() const { return nSrcMaxRow; } + CharSet GetSrcCharSet() const { return eSrcSet; } + ULONG GetSrcVersion() const { return nSrcVer; } + SCROW GetSrcMaxRow() const { return nSrcMaxRow; } - void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } - void UpdateFontCharSet(); + void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } + void UpdateFontCharSet(); void FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, SCTAB nTab, double nScaleX, double nScaleY, BOOL bPageMode, BOOL bFormulaMode, const ScMarkData* pMarkData = NULL ); - SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; + SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; - void Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery ); - SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub ); - BOOL ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL ); - SC_DLLPUBLIC BOOL CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery ); + SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub ); + BOOL ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL ); + SC_DLLPUBLIC BOOL CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); - void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); + void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); - BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates); - SC_DLLPUBLIC BOOL GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, + SC_DLLPUBLIC BOOL GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, BOOL bLimit = FALSE ); - BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); + BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); - BOOL HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); + BOOL HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); - void SetPrinter( SfxPrinter* pNewPrinter ); - VirtualDevice* GetVirtualDevice_100th_mm(); - SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... + SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); + void SetPrinter( SfxPrinter* pNewPrinter ); + VirtualDevice* GetVirtualDevice_100th_mm(); + SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... - void EraseNonUsedSharedNames(USHORT nLevel); - BOOL GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, + void EraseNonUsedSharedNames(USHORT nLevel); + BOOL GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, BOOL bInSel, const ScMarkData& rMark) const; - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, + BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, SCTAB nTab, ScMarkData& rMark, BOOL bIsUndo); - void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); + void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); - void InvalidateTextWidth( const String& rStyleName ); - void InvalidateTextWidth( SCTAB nTab ); + void InvalidateTextWidth( const String& rStyleName ); + void InvalidateTextWidth( SCTAB nTab ); void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, BOOL bNumFormatChanged ); - BOOL IdleCalcTextWidth(); - BOOL IdleCheckLinks(); + BOOL IdleCalcTextWidth(); + BOOL IdleCheckLinks(); - BOOL ContinueOnlineSpelling(); // TRUE = etwas gefunden + BOOL ContinueOnlineSpelling(); // TRUE = etwas gefunden - BOOL IsIdleDisabled() const { return bIdleDisabled; } - void DisableIdle(BOOL bDo) { bIdleDisabled = bDo; } + BOOL IsIdleDisabled() const { return bIdleDisabled; } + void DisableIdle(BOOL bDo) { bIdleDisabled = bDo; } - BOOL IsDetectiveDirty() const { return bDetectiveDirty; } - void SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; } + BOOL IsDetectiveDirty() const { return bDetectiveDirty; } + void SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; } - void RemoveAutoSpellObj(); - void SetOnlineSpellPos( const ScAddress& rPos ); - SC_DLLPUBLIC BOOL SetVisibleSpellRange( const ScRange& rRange ); // TRUE = changed + void RemoveAutoSpellObj(); + void SetOnlineSpellPos( const ScAddress& rPos ); + SC_DLLPUBLIC BOOL SetVisibleSpellRange( const ScRange& rRange ); // TRUE = changed - BYTE GetMacroCallMode() const { return nMacroCallMode; } - void SetMacroCallMode(BYTE nNew) { nMacroCallMode = nNew; } + BYTE GetMacroCallMode() const { return nMacroCallMode; } + void SetMacroCallMode(BYTE nNew) { nMacroCallMode = nNew; } - BOOL GetHasMacroFunc() const { return bHasMacroFunc; } - void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } + BOOL GetHasMacroFunc() const { return bHasMacroFunc; } + void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } - BOOL CheckMacroWarn(); + BOOL CheckMacroWarn(); void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; } sal_Bool HasRangeOverflow() const { return nRangeOverflowType != 0; } SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; } // fuer Broadcasting/Listening - void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; } - BOOL GetNoSetDirty() const { return bNoSetDirty; } - void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } - BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } + void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; } + BOOL GetNoSetDirty() const { return bNoSetDirty; } + void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } + BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } void SetLoadingMedium( bool bVal ); void SetImportingXML( bool bVal ); bool IsImportingXML() const { return bImportingXML; } - void SetXMLFromWrapper( BOOL bVal ); - BOOL IsXMLFromWrapper() const { return bXMLFromWrapper; } - void SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; } - BOOL IsCalcingAfterLoad() const { return bCalcingAfterLoad; } - void SetNoListening( BOOL bVal ) { bNoListening = bVal; } - BOOL GetNoListening() const { return bNoListening; } - ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } + void SetXMLFromWrapper( BOOL bVal ); + BOOL IsXMLFromWrapper() const { return bXMLFromWrapper; } + void SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; } + BOOL IsCalcingAfterLoad() const { return bCalcingAfterLoad; } + void SetNoListening( BOOL bVal ) { bNoListening = bVal; } + BOOL GetNoListening() const { return bNoListening; } + ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } ScChartListenerCollection* GetChartListenerCollection() const { return pChartListenerCollection; } - void SetChartListenerCollection( ScChartListenerCollection*, + void SetChartListenerCollection( ScChartListenerCollection*, BOOL bSetChartRangeLists = FALSE ); - void UpdateChart( const String& rName ); + void UpdateChart( const String& rName ); void RestoreChartListener( const String& rName ); - SC_DLLPUBLIC void UpdateChartListenerCollection(); - BOOL IsChartListenerCollectionNeedsUpdate() const + SC_DLLPUBLIC void UpdateChartListenerCollection(); + BOOL IsChartListenerCollectionNeedsUpdate() const { return bChartListenerCollectionNeedsUpdate; } - void SetChartListenerCollectionNeedsUpdate( BOOL bFlg ) + void SetChartListenerCollectionNeedsUpdate( BOOL bFlg ) { bChartListenerCollectionNeedsUpdate = bFlg; } - void AddOLEObjectToCollection(const String& rName); + void AddOLEObjectToCollection(const String& rName); - ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } - SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); + ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } + SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); vos::ORef GetForbiddenCharacters(); - void SetForbiddenCharacters( const vos::ORef xNew ); + void SetForbiddenCharacters( const vos::ORef xNew ); - BYTE GetAsianCompression() const; // CharacterCompressionType values - BOOL IsValidAsianCompression() const; - void SetAsianCompression(BYTE nNew); + BYTE GetAsianCompression() const; // CharacterCompressionType values + BOOL IsValidAsianCompression() const; + void SetAsianCompression(BYTE nNew); - BOOL GetAsianKerning() const; - BOOL IsValidAsianKerning() const; - void SetAsianKerning(BOOL bNew); + BOOL GetAsianKerning() const; + BOOL IsValidAsianKerning() const; + void SetAsianKerning(BOOL bNew); - BYTE GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values + BYTE GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values - SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} - void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} + SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} + void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} private: ScDocument(const ScDocument& r); // disabled with no definition - void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, + void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const; - USHORT RowDifferences( SCROW nThisRow, SCTAB nThisTab, + USHORT RowDifferences( SCROW nThisRow, SCTAB nThisTab, ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab, SCCOL nMaxCol, SCCOLROW* pOtherCols ); - USHORT ColDifferences( SCCOL nThisCol, SCTAB nThisTab, + USHORT ColDifferences( SCCOL nThisCol, SCTAB nThisTab, ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab, SCROW nMaxRow, SCCOLROW* pOtherRows ); - void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow, + void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow, BOOL bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab, SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, ULONG nProAdd ); - BOOL OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, + BOOL OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, USHORT nMaxTest ); DECL_LINK( TrackTimeHdl, Timer* ); @@ -1610,9 +1610,9 @@ private: static ScRecursionHelper* CreateRecursionHelperInstance(); public: - void StartListeningArea( const ScRange& rRange, + void StartListeningArea( const ScRange& rRange, SvtListener* pListener ); - void EndListeningArea( const ScRange& rRange, + void EndListeningArea( const ScRange& rRange, SvtListener* pListener ); /** Broadcast wrapper, calls SC_DLLPUBLIC rHint.GetCell()->Broadcast() and AreaBroadcast() @@ -1622,73 +1622,73 @@ public: */ void Broadcast( const ScHint& rHint ); /// deprecated - void Broadcast( ULONG nHint, const ScAddress& rAddr, + void Broadcast( ULONG nHint, const ScAddress& rAddr, ScBaseCell* pCell ); /// only area, no cell broadcast void AreaBroadcast( const ScHint& rHint ); /// only areas in range, no cell broadcasts void AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ); - void DelBroadcastAreasInRange( const ScRange& rRange ); - void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, + void DelBroadcastAreasInRange( const ScRange& rRange ); + void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void StartListeningCell( const ScAddress& rAddress, + void StartListeningCell( const ScAddress& rAddress, SvtListener* pListener ); - void EndListeningCell( const ScAddress& rAddress, + void EndListeningCell( const ScAddress& rAddress, SvtListener* pListener ); - void PutInFormulaTree( ScFormulaCell* pCell ); - void RemoveFromFormulaTree( ScFormulaCell* pCell ); - void CalcFormulaTree( BOOL bOnlyForced = FALSE, + void PutInFormulaTree( ScFormulaCell* pCell ); + void RemoveFromFormulaTree( ScFormulaCell* pCell ); + void CalcFormulaTree( BOOL bOnlyForced = FALSE, BOOL bNoProgressBar = FALSE ); - void ClearFormulaTree(); - void AppendToFormulaTrack( ScFormulaCell* pCell ); - void RemoveFromFormulaTrack( ScFormulaCell* pCell ); - void TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED ); - USHORT GetFormulaTrackCount() const { return nFormulaTrackCount; } - BOOL IsInFormulaTree( ScFormulaCell* pCell ) const; - BOOL IsInFormulaTrack( ScFormulaCell* pCell ) const; - USHORT GetHardRecalcState() { return nHardRecalcState; } - void SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; } - void StartAllListeners(); - const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } - BOOL HasForcedFormulas() const { return bHasForcedFormulas; } - void SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; } - ULONG GetFormulaCodeInTree() const { return nFormulaCodeInTree; } - BOOL IsInInterpreter() const { return nInterpretLevel != 0; } - USHORT GetInterpretLevel() { return nInterpretLevel; } - void IncInterpretLevel() + void ClearFormulaTree(); + void AppendToFormulaTrack( ScFormulaCell* pCell ); + void RemoveFromFormulaTrack( ScFormulaCell* pCell ); + void TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED ); + USHORT GetFormulaTrackCount() const { return nFormulaTrackCount; } + BOOL IsInFormulaTree( ScFormulaCell* pCell ) const; + BOOL IsInFormulaTrack( ScFormulaCell* pCell ) const; + USHORT GetHardRecalcState() { return nHardRecalcState; } + void SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; } + void StartAllListeners(); + const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } + BOOL HasForcedFormulas() const { return bHasForcedFormulas; } + void SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; } + ULONG GetFormulaCodeInTree() const { return nFormulaCodeInTree; } + BOOL IsInInterpreter() const { return nInterpretLevel != 0; } + USHORT GetInterpretLevel() { return nInterpretLevel; } + void IncInterpretLevel() { if ( nInterpretLevel < USHRT_MAX ) nInterpretLevel++; } - void DecInterpretLevel() + void DecInterpretLevel() { if ( nInterpretLevel ) nInterpretLevel--; } - BOOL IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } - USHORT GetMacroInterpretLevel() { return nMacroInterpretLevel; } - void IncMacroInterpretLevel() + BOOL IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } + USHORT GetMacroInterpretLevel() { return nMacroInterpretLevel; } + void IncMacroInterpretLevel() { if ( nMacroInterpretLevel < USHRT_MAX ) nMacroInterpretLevel++; } - void DecMacroInterpretLevel() + void DecMacroInterpretLevel() { if ( nMacroInterpretLevel ) nMacroInterpretLevel--; } - BOOL IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } - USHORT GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } - void IncInterpreterTableOpLevel() + BOOL IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } + USHORT GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } + void IncInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel < USHRT_MAX ) nInterpreterTableOpLevel++; } - void DecInterpreterTableOpLevel() + void DecInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel ) nInterpreterTableOpLevel--; @@ -1702,12 +1702,12 @@ public: pRecursionHelper = CreateRecursionHelperInstance(); return *pRecursionHelper; } - BOOL IsInDtorClear() const { return bInDtorClear; } - void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } - BOOL IsExpandRefs() { return bExpandRefs; } + BOOL IsInDtorClear() const { return bInDtorClear; } + void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } + BOOL IsExpandRefs() { return bExpandRefs; } - SC_DLLPUBLIC void IncSizeRecalcLevel( SCTAB nTab ); - SC_DLLPUBLIC void DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true ); + SC_DLLPUBLIC void IncSizeRecalcLevel( SCTAB nTab ); + SC_DLLPUBLIC void DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true ); ULONG GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } void IncXMLImportedFormulaCount( ULONG nVal ) @@ -1723,12 +1723,12 @@ public: nXMLImportedFormulaCount = 0; } - void StartTrackTimer(); + void StartTrackTimer(); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); /** Maximum string length of a column, e.g. for dBase export. @return String length in octets (!) of the destination encoding. In @@ -1744,36 +1744,36 @@ public: SCTAB nTab, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void KeyInput( const KeyEvent& rKEvt ); // TimerDelays etc. + void KeyInput( const KeyEvent& rKEvt ); // TimerDelays etc. - ScChangeTrack* GetChangeTrack() const { return pChangeTrack; } + ScChangeTrack* GetChangeTrack() const { return pChangeTrack; } //! only for import filter, deletes any existing ChangeTrack via //! EndChangeTracking() and takes ownership of new ChangeTrack pTrack - SC_DLLPUBLIC void SetChangeTrack( ScChangeTrack* pTrack ); + SC_DLLPUBLIC void SetChangeTrack( ScChangeTrack* pTrack ); - void StartChangeTracking(); - void EndChangeTracking(); + void StartChangeTracking(); + void EndChangeTracking(); - SC_DLLPUBLIC void CompareDocument( ScDocument& rOtherDoc ); + SC_DLLPUBLIC void CompareDocument( ScDocument& rOtherDoc ); - void AddUnoObject( SfxListener& rObject ); - void RemoveUnoObject( SfxListener& rObject ); - void BroadcastUno( const SfxHint &rHint ); - void AddUnoListenerCall( const ::com::sun::star::uno::Reference< + void AddUnoObject( SfxListener& rObject ); + void RemoveUnoObject( SfxListener& rObject ); + void BroadcastUno( const SfxHint &rHint ); + void AddUnoListenerCall( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& rListener, const ::com::sun::star::lang::EventObject& rEvent ); - void SetInLinkUpdate(BOOL bSet); // TableLink or AreaLink - BOOL IsInLinkUpdate() const; // including DdeLink + void SetInLinkUpdate(BOOL bSet); // TableLink or AreaLink + BOOL IsInLinkUpdate() const; // including DdeLink - SC_DLLPUBLIC SfxItemPool* GetEditPool() const; - SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; - SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); - SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); -//UNUSED2009-05 SfxItemPool& GetNoteItemPool(); + SC_DLLPUBLIC SfxItemPool* GetEditPool() const; + SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; + SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); + SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); +//UNUSED2009-05 SfxItemPool& GetNoteItemPool(); - ScRefreshTimerControl* GetRefreshTimerControl() const + ScRefreshTimerControl* GetRefreshTimerControl() const { return pRefreshTimerControl; } ScRefreshTimerControl * const * GetRefreshTimerControlAddress() const { return &pRefreshTimerControl; } @@ -1807,9 +1807,9 @@ public: private: // CLOOK-Impl-Methoden - /** - * Use this class as a locale variable to merge number formatter from - * another document, and set NULL pointer to pFormatExchangeList when + /** + * Use this class as a locale variable to merge number formatter from + * another document, and set NULL pointer to pFormatExchangeList when * done. */ class NumFmtMergeHandler @@ -1824,25 +1824,25 @@ private: // CLOOK-Impl-Methoden void MergeNumberFormatter(ScDocument* pSrcDoc); - void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? - void ImplDeleteOptions(); + void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? + void ImplDeleteOptions(); - void DeleteDrawLayer(); - void DeleteColorTable(); - SC_DLLPUBLIC BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - void DrawMovePage( USHORT nOldPos, USHORT nNewPos ); - void DrawCopyPage( USHORT nOldPos, USHORT nNewPos ); + void DeleteDrawLayer(); + void DeleteColorTable(); + SC_DLLPUBLIC BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; + void DrawMovePage( USHORT nOldPos, USHORT nNewPos ); + void DrawCopyPage( USHORT nOldPos, USHORT nNewPos ); - void UpdateDrawPrinter(); - void UpdateDrawLanguages(); + void UpdateDrawPrinter(); + void UpdateDrawLanguages(); void UpdateDrawDefaults(); - SC_DLLPUBLIC void InitClipPtrs( ScDocument* pSourceDoc ); + SC_DLLPUBLIC void InitClipPtrs( ScDocument* pSourceDoc ); - void LoadDdeLinks(SvStream& rStream); - void SaveDdeLinks(SvStream& rStream) const; + void LoadDdeLinks(SvStream& rStream); + void SaveDdeLinks(SvStream& rStream) const; void DeleteAreaLinksOnTab( SCTAB nTab ); - void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, + void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs); @@ -1851,7 +1851,7 @@ private: // CLOOK-Impl-Methoden ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark, SCCOL nXw, SCROW nYw); - BOOL HasPartOfMerged( const ScRange& rRange ); + BOOL HasPartOfMerged( const ScRange& rRange ); std::map< SCTAB, ScSortParam > mSheetSortParams; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 14c9515dfacb..19448b08cdb0 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -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 @@ -88,14 +88,14 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel, public com::sun::star::view::XRenderable, public com::sun::star::document::XLinkTargetSupplier, public com::sun::star::beans::XPropertySet, - public SvxFmMSFactory, // derived from XMultiServiceFactory + public SvxFmMSFactory, // derived from XMultiServiceFactory public com::sun::star::lang::XServiceInfo, public ::com::sun::star::util::XChangesNotifier { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - ScPrintFuncCache* pPrintFuncCache; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + ScPrintFuncCache* pPrintFuncCache; ScPrintUIOptions* pPrinterOptions; com::sun::star::uno::Reference xNumberAgg; com::sun::star::uno::Reference xDrawGradTab; @@ -108,24 +108,24 @@ private: ::cppu::OInterfaceContainerHelper maChangesListeners; - BOOL FillRenderMarkData( const com::sun::star::uno::Any& aSelection, + BOOL FillRenderMarkData( const com::sun::star::uno::Any& aSelection, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions, ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const; com::sun::star::uno::Reference GetFormatter(); void HandleCalculateEvents(); - rtl::OUString maBuildId; + rtl::OUString maBuildId; protected: const SfxItemPropertySet& GetPropertySet() const { return aPropSet; } public: ScModelObj(ScDocShell* pDocSh); - virtual ~ScModelObj(); + virtual ~ScModelObj(); - // create ScModelObj and set at pDocSh (SetBaseModel) - static void CreateAndSet(ScDocShell* pDocSh); + // create ScModelObj and set at pDocSh (SetBaseModel) + static void CreateAndSet(ScDocShell* pDocSh); - ScDocument* GetDocument() const; + ScDocument* GetDocument() const; SfxObjectShell* GetEmbeddedObject() const; void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL ); @@ -143,12 +143,12 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); -//? virtual UString getClassName(void); +//? virtual UString getClassName(void); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSpreadsheetDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheets > SAL_CALL @@ -170,7 +170,7 @@ public: ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, + virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, @@ -182,9 +182,9 @@ public: // XActionLockable virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); @@ -192,35 +192,35 @@ public: virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException); // XCalculatable - virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) + virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); - // XDrawPagesSupplier + // XDrawPagesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages() throw(::com::sun::star::uno::RuntimeException); - //! XPrintable?? + //! XPrintable?? - // XGoalSeek + // XGoalSeek virtual ::com::sun::star::sheet::GoalResult SAL_CALL seekGoal( const ::com::sun::star::table::CellAddress& aFormulaPosition, const ::com::sun::star::table::CellAddress& aVariablePosition, const ::rtl::OUString& aGoalValue ) throw(::com::sun::star::uno::RuntimeException); - // XConsolidatable + // XConsolidatable virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XConsolidationDescriptor > SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); @@ -228,8 +228,8 @@ public: ::com::sun::star::sheet::XConsolidationDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); - // XDocumentAuditing - virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException); + // XDocumentAuditing + virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException); // XViewDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData( ) @@ -239,7 +239,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -251,25 +251,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -329,22 +329,22 @@ class ScDrawPagesObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > GetObjectByIndex_Impl(INT32 nIndex) const; public: ScDrawPagesObj(ScDocShell* pDocSh); - virtual ~ScDrawPagesObj(); + virtual ~ScDrawPagesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDrawPages virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); @@ -379,23 +379,23 @@ class ScTableSheetsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScTableSheetsObj(ScDocShell* pDocSh); - virtual ~ScTableSheetsObj(); + virtual ~ScTableSheetsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSpreadsheets - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, sal_Int16 nPosition ) + virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, sal_Int16 nPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination ) + virtual void SAL_CALL moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL copyByName( const ::rtl::OUString& aName, + virtual void SAL_CALL copyByName( const ::rtl::OUString& aName, const ::rtl::OUString& aCopy, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); @@ -414,19 +414,19 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -478,25 +478,25 @@ class ScTableColumnsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - SCCOL nStartCol; - SCCOL nEndCol; + ScDocShell* pDocShell; + SCTAB nTab; + SCCOL nStartCol; + SCCOL nEndCol; - ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableColumnObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableColumnObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC); - virtual ~ScTableColumnsObj(); + virtual ~ScTableColumnsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableColumns - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -529,7 +529,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -541,25 +541,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -584,24 +584,24 @@ class ScTableRowsObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - SCROW nStartRow; - SCROW nEndRow; + ScDocShell* pDocShell; + SCTAB nTab; + SCROW nStartRow; + SCROW nEndRow; - ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER); - virtual ~ScTableRowsObj(); + virtual ~ScTableRowsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableRows - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -624,7 +624,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -636,25 +636,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -677,19 +677,19 @@ class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; public: //UNUSED2008-05 ScSpreadsheetSettingsObj(ScDocShell* pDocSh); - virtual ~ScSpreadsheetSettingsObj(); + virtual ~ScSpreadsheetSettingsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -701,25 +701,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -743,23 +743,23 @@ class ScAnnotationsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Collection haengt am Sheet + ScDocShell* pDocShell; + SCTAB nTab; // Collection haengt am Sheet - bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const; - ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; + bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const; + ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; public: ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScAnnotationsObj(); + virtual ~ScAnnotationsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSheetAnnotations - virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, + virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -796,26 +796,26 @@ class ScScenariosObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; + ScDocShell* pDocShell; + SCTAB nTab; - BOOL GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); - ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + BOOL GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); + ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); + ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScScenariosObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScScenariosObj(); + virtual ~ScScenariosObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XScenarios - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, const ::rtl::OUString& aComment ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx index eab01d078081..a892cbaef83a 100644 --- a/sc/inc/dpcachetable.hxx +++ b/sc/inc/dpcachetable.hxx @@ -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 @@ -168,7 +168,7 @@ public: ScDPTableDataCache* GetCache() const; /** Fill the internal table from the cell range provided. This function assumes that the first row is the column header. */ - void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, + void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, bool bIgnoreEmptyRows, bool bRepeatIfEmpty ); /** Fill the internal table from database connection object. This function assumes that the first row is the column header. */ @@ -188,7 +188,7 @@ public: that the data grid doesn't include the header row. Don't delete the returned object! */ const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; - void getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; + void getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; String getFieldName( SCCOL nIndex) const; //End Comments @@ -219,7 +219,7 @@ private: ScDPCacheTable(); ScDPCacheTable(const ScDPCacheTable&); - /** + /** * Check if a given row meets all specified criteria. * * @param nRow index of row to be tested. diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index f887ed91ea32..18b4966cd7fd 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -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/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index 7de5947cc969..320f292bb025 100755 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -30,7 +30,7 @@ ************************************************************************/ // Wang Xu Ming - DataPilot migration // Buffer&&Performance -// +// #ifndef _SC_DPGLOBAL_HXX #define _SC_DPGLOBAL_HXX @@ -64,38 +64,38 @@ #define MAX_PAGEFIELDS 10 // maximum count of fields for page area -#define PIVOT_MAXFUNC 11 -#define PIVOT_FUNC_NONE 0x0000 -#define PIVOT_FUNC_SUM 0x0001 -#define PIVOT_FUNC_COUNT 0x0002 -#define PIVOT_FUNC_AVERAGE 0x0004 -#define PIVOT_FUNC_MAX 0x0008 -#define PIVOT_FUNC_MIN 0x0010 -#define PIVOT_FUNC_PRODUCT 0x0020 -#define PIVOT_FUNC_COUNT_NUM 0x0040 -#define PIVOT_FUNC_STD_DEV 0x0080 -#define PIVOT_FUNC_STD_DEVP 0x0100 -#define PIVOT_FUNC_STD_VAR 0x0200 -#define PIVOT_FUNC_STD_VARP 0x0400 -#define PIVOT_FUNC_AUTO 0x1000 - -#define DATA_RENAME_SEPARATOR "_" +#define PIVOT_MAXFUNC 11 +#define PIVOT_FUNC_NONE 0x0000 +#define PIVOT_FUNC_SUM 0x0001 +#define PIVOT_FUNC_COUNT 0x0002 +#define PIVOT_FUNC_AVERAGE 0x0004 +#define PIVOT_FUNC_MAX 0x0008 +#define PIVOT_FUNC_MIN 0x0010 +#define PIVOT_FUNC_PRODUCT 0x0020 +#define PIVOT_FUNC_COUNT_NUM 0x0040 +#define PIVOT_FUNC_STD_DEV 0x0080 +#define PIVOT_FUNC_STD_DEVP 0x0100 +#define PIVOT_FUNC_STD_VAR 0x0200 +#define PIVOT_FUNC_STD_VARP 0x0400 +#define PIVOT_FUNC_AUTO 0x1000 + +#define DATA_RENAME_SEPARATOR "_" #define __MAX_NUM_LEN 64 -#define __DECIMALPLACE 18 - -#define DP_PROP_COLUMNGRAND "ColumnGrand" -#define DP_PROP_FUNCTION "Function" -#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -#define DP_PROP_ISVISIBLE "IsVisible" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" -#define DP_PROP_ROWGRAND "RowGrand" -#define DP_PROP_SHOWDETAILS "ShowDetails" -#define DP_PROP_SHOWEMPTY "ShowEmpty" -#define DP_PROP_SUBTOTALS "SubTotals" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" -#define DP_PROP_FILTER "Filter" +#define __DECIMALPLACE 18 + +#define DP_PROP_COLUMNGRAND "ColumnGrand" +#define DP_PROP_FUNCTION "Function" +#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +#define DP_PROP_ISVISIBLE "IsVisible" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" +#define DP_PROP_ROWGRAND "RowGrand" +#define DP_PROP_SHOWDETAILS "ShowDetails" +#define DP_PROP_SHOWEMPTY "ShowEmpty" +#define DP_PROP_SUBTOTALS "SubTotals" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +#define DP_PROP_FILTER "Filter" #define DP_PROP_POSITION "Position" #define DBG_TRACESTR( x ) \ @@ -114,53 +114,53 @@ public: private: union { - ULONG nNumFormat; + ULONG nNumFormat; sal_Int32 mnDatePart; }; - String aString; - double fValue; - BYTE mbFlag; - //BOOL bHasValue: 1 ; - //BOOL bHasData: 1; - //BOOL bErr: 1; + String aString; + double fValue; + BYTE mbFlag; + //BOOL bHasValue: 1 ; + //BOOL bHasData: 1; + //BOOL bErr: 1; friend class ScDPTableDataCache; public: ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){} ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} - ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ; + ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ; ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ); - void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } -// void SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;} - BOOL IsCaseInsEqual( const ScDPItemData& r ) const; - - size_t Hash() const; + void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } +// void SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;} + BOOL IsCaseInsEqual( const ScDPItemData& r ) const; + size_t Hash() const; + // exact equality - BOOL operator==( const ScDPItemData& r ) const; + BOOL operator==( const ScDPItemData& r ) const; // case insensitive equality - static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); + static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); #ifdef DEBUG - void dump() const; + void dump() const; #endif public: BOOL IsHasData() const ; BOOL IsHasErr() const ; BOOL IsValue() const; - String GetString() const ; - double GetValue() const ; + String GetString() const ; + double GetValue() const ; ULONG GetNumFormat() const ; BOOL HasStringData() const ; BOOL IsDate() const; BOOL HasDatePart() const; void SetDate( BOOL b ) ; - + TypedStrData* CreateTypeString( ); - sal_uInt8 GetType() const; + sal_uInt8 GetType() const; BYTE & GetFlag() throw() { return mbFlag; } const BYTE & GetFlag() const throw() { return const_cast(this)->GetFlag(); } }; @@ -171,7 +171,7 @@ public: // construct ScDPItemDataPool(void); ScDPItemDataPool(const ScDPItemDataPool& r); - + virtual ~ScDPItemDataPool(void); virtual const ScDPItemData* getData( sal_Int32 nId ); virtual sal_Int32 getDataId( const ScDPItemData& aData ); @@ -194,16 +194,16 @@ class ScTabViewShell; namespace ScDPGlobal { // used for core data - String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue ); + String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue ); String GetFuncString( const String &rString, const USHORT nIndex ); com::sun::star::uno::Reference DP_GetMembers( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>&rSrc, long nField ); // common operation String operator + ( const String & rL, const String &rR ); Rectangle operator *( const Rectangle &rLeft, const std::pair & rRight ); -// used for DataPilot Panel +// used for DataPilot Panel ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell ); bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip = FALSE ); } -#endif +#endif diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index a22b6fd6a2eb..6e6dc6f49aea 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -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 @@ -78,7 +78,7 @@ public: // Wang Xu Ming -- 2009-9-8 // DataPilot Migration - Cache&&Performance - void FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCache* pCahe , std::vector< SCROW >& rEntries, + void FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCache* pCahe , std::vector< SCROW >& rEntries, const std::vector< SCROW >& rOriginal ) const; // End Comments }; @@ -123,7 +123,7 @@ public: ScDPGroupDimension( const ScDPGroupDimension& rOther ); ~ScDPGroupDimension(); - ScDPGroupDimension& operator=( const ScDPGroupDimension& rOther ); + ScDPGroupDimension& operator=( const ScDPGroupDimension& rOther ); void AddItem( const ScDPGroupItem& rItem ); void SetGroupDim( long nDim ); // called from AddGroupDimension @@ -170,14 +170,14 @@ public: ScDPNumGroupDimension( const ScDPNumGroupDimension& rOther ); ~ScDPNumGroupDimension(); - ScDPNumGroupDimension& operator=( const ScDPNumGroupDimension& rOther ); + ScDPNumGroupDimension& operator=( const ScDPNumGroupDimension& rOther ); const ScDPNumGroupInfo& GetInfo() const { return aGroupInfo; } bool HasNonInteger() const { return bHasNonInteger; } sal_Unicode GetDecSeparator() const { return cDecSeparator; } const ScDPDateGroupHelper* GetDateHelper() const { return pDateHelper; } - + const std::vector< SCROW >& GetNumEntries( SCCOL nSourceDim, ScDPTableDataCache* pCache, const std::vector< SCROW >& rOriginal ) const; @@ -204,8 +204,8 @@ class ScDPGroupTableData : public ScDPTableData // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void FillGroupValues( SCROW* pItemDataIndex, long nCount, const long* pDims ); - virtual long GetSourceDim( long nDim ); + void FillGroupValues( SCROW* pItemDataIndex, long nCount, const long* pDims ); + virtual long GetSourceDim( long nDim ); // End Comments bool IsNumGroupDimension( long nDimension ) const; @@ -228,7 +228,7 @@ public: virtual long GetColumnCount(); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - virtual long GetMembersCount( long nDim ); + virtual long GetMembersCount( long nDim ); virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual long Compare( long nDim, long nDataId1, long nDataId2); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 44aa1daa9a92..e2145a45e327 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -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 @@ -68,18 +68,18 @@ class ScDPTableData; struct ScDPServiceDesc { - String aServiceName; - String aParSource; - String aParName; - String aParUser; - String aParPass; + String aServiceName; + String aParSource; + String aParName; + String aParUser; + String aParPass; ScDPServiceDesc( const String& rServ, const String& rSrc, const String& rNam, const String& rUser, const String& rPass ) : aServiceName( rServ ), aParSource( rSrc ), aParName( rNam ), - aParUser( rUser ), aParPass( rPass ) { } + aParUser( rUser ), aParPass( rPass ) { } - BOOL operator== ( const ScDPServiceDesc& rOther ) const + BOOL operator== ( const ScDPServiceDesc& rOther ) const { return aServiceName == rOther.aServiceName && aParSource == rOther.aParSource && aParName == rOther.aParName && @@ -91,32 +91,32 @@ struct ScDPServiceDesc class SC_DLLPUBLIC ScDPObject : public ScDataObject { private: - ScDocument* pDoc; + ScDocument* pDoc; // settings - ScDPSaveData* pSaveData; - String aTableName; - String aTableTag; - ScRange aOutRange; - ScSheetSourceDesc* pSheetDesc; // for sheet data - ScImportSourceDesc* pImpDesc; // for database data - ScDPServiceDesc* pServDesc; // for external service + ScDPSaveData* pSaveData; + String aTableName; + String aTableTag; + ScRange aOutRange; + ScSheetSourceDesc* pSheetDesc; // for sheet data + ScImportSourceDesc* pImpDesc; // for database data + ScDPServiceDesc* pServDesc; // for external service ::boost::shared_ptr mpTableData; // cached data com::sun::star::uno::Reference xSource; - ScDPOutput* pOutput; - BOOL bSettingsChanged; - BOOL bAlive; // FALSE if only used to hold settings + ScDPOutput* pOutput; + BOOL bSettingsChanged; + BOOL bAlive; // FALSE if only used to hold settings sal_uInt16 mnAutoFormatIndex; - BOOL bAllowMove; - long nHeaderRows; // page fields plus filter button + BOOL bAllowMove; + long nHeaderRows; // page fields plus filter button bool mbHeaderLayout; // TRUE : grid, FALSE : standard SC_DLLPRIVATE ScDPTableData* GetTableData(); - SC_DLLPRIVATE void CreateObjects(); - SC_DLLPRIVATE void CreateOutput(); - BOOL bRefresh; - long mnCacheId; + SC_DLLPRIVATE void CreateObjects(); + SC_DLLPRIVATE void CreateOutput(); + BOOL bRefresh; + long mnCacheId; public: // Wang Xu Ming -- 2009-8-17 @@ -129,56 +129,56 @@ public: // End Comments ScDPObject( ScDocument* pD ); ScDPObject(const ScDPObject& r); - virtual ~ScDPObject(); + virtual ~ScDPObject(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - void SetAlive(BOOL bSet); - void SetAllowMove(BOOL bSet); + void SetAlive(BOOL bSet); + void SetAllowMove(BOOL bSet); - void InvalidateData(); - void InvalidateSource(); + void InvalidateData(); + void InvalidateSource(); - void Output( const ScAddress& rPos ); - ScRange GetNewOutputRange( BOOL& rOverflow ); + void Output( const ScAddress& rPos ); + ScRange GetNewOutputRange( BOOL& rOverflow ); const ScRange GetOutputRangeByType( sal_Int32 nType ); - void SetSaveData(const ScDPSaveData& rData); - ScDPSaveData* GetSaveData() const { return pSaveData; } + void SetSaveData(const ScDPSaveData& rData); + ScDPSaveData* GetSaveData() const { return pSaveData; } - void SetOutRange(const ScRange& rRange); - const ScRange& GetOutRange() const { return aOutRange; } + void SetOutRange(const ScRange& rRange); + const ScRange& GetOutRange() const { return aOutRange; } void SetAutoFormatIndex (const sal_uInt16 nIndex); - sal_uInt16 GetAutoFormatIndex() const; + sal_uInt16 GetAutoFormatIndex() const; void SetHeaderLayout(bool bUseGrid); bool GetHeaderLayout() const; - void SetSheetDesc(const ScSheetSourceDesc& rDesc); - void SetImportDesc(const ScImportSourceDesc& rDesc); - void SetServiceData(const ScDPServiceDesc& rDesc); + void SetSheetDesc(const ScSheetSourceDesc& rDesc); + void SetImportDesc(const ScImportSourceDesc& rDesc); + void SetServiceData(const ScDPServiceDesc& rDesc); - void WriteSourceDataTo( ScDPObject& rDest ) const; - void WriteTempDataTo( ScDPObject& rDest ) const; + void WriteSourceDataTo( ScDPObject& rDest ) const; + void WriteTempDataTo( ScDPObject& rDest ) const; - const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; } - const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } - const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } + const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; } + const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } + const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } com::sun::star::uno::Reference GetSource(); - BOOL IsSheetData() const; - BOOL IsImportData() const { return(pImpDesc != NULL); } - BOOL IsServiceData() const { return(pServDesc != NULL); } + BOOL IsSheetData() const; + BOOL IsImportData() const { return(pImpDesc != NULL); } + BOOL IsServiceData() const { return(pServDesc != NULL); } - void SetName(const String& rNew); - const String& GetName() const { return aTableName; } - void SetTag(const String& rNew); - const String& GetTag() const { return aTableTag; } + void SetName(const String& rNew); + const String& GetName() const { return aTableName; } + void SetTag(const String& rNew); + const String& GetTag() const { return aTableTag; } - /** + /** * Data description cell displays the description of a data dimension if * and only if there is only one data dimension. It's usually located at * the upper-left corner of the table output. @@ -186,15 +186,15 @@ public: bool IsDataDescriptionCell(const ScAddress& rPos); bool IsDimNameInUse(const ::rtl::OUString& rName) const; - String GetDimName( long nDim, BOOL& rIsDataLayout ); + String GetDimName( long nDim, BOOL& rIsDataLayout ); BOOL IsDuplicated( long nDim ); long GetDimCount(); void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); + BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + BOOL IsFilterButton( const ScAddress& rPos ); BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); @@ -204,13 +204,13 @@ public: void GetMemberResultNames( ScStrCollection& rNames, long nDimension ); - void FillPageList( TypedScStrCollection& rStrings, long nField ); + void FillPageList( TypedScStrCollection& rStrings, long nField ); void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; - BOOL FillLabelData(ScPivotParam& rParam); - void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); + BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; + BOOL FillLabelData(ScPivotParam& rParam); + void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); BOOL GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); BOOL GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); @@ -223,34 +223,34 @@ public: bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector& rMembers ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPObject& r ) const; - void WriteRefsTo( ScDPObject& r ) const; + BOOL RefsEqual( const ScDPObject& r ) const; + void WriteRefsTo( ScDPObject& r ) const; void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); - bool GetDataFieldPositionData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< + bool GetDataFieldPositionData(const ScAddress& rPos, + ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters); - void GetDrillDownData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< + void GetDrillDownData(const ScAddress& rPos, + ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTableData); // apply drop-down attribute, initialize nHeaderRows, without accessing the source // (button attribute must be present) - void RefreshAfterLoad(); + void RefreshAfterLoad(); void BuildAllDimensionMembers(); - static BOOL HasRegisteredSources(); + static BOOL HasRegisteredSources(); static com::sun::star::uno::Sequence GetRegisteredSources(); static com::sun::star::uno::Reference CreateSource( const ScDPServiceDesc& rDesc ); - static void ConvertOrientation( ScDPSaveData& rSaveData, + static void ConvertOrientation( ScDPSaveData& rSaveData, PivotField* pFields, SCSIZE nCount, USHORT nOrient, ScDocument* pDoc, SCROW nRow, SCTAB nTab, const com::sun::star::uno::Reference< @@ -267,25 +267,25 @@ public: class ScDPCollection : public ScCollection { private: - ScDocument* pDoc; + ScDocument* pDoc; public: ScDPCollection(ScDocument* pDocument); ScDPCollection(const ScDPCollection& r); - virtual ~ScDPCollection(); + virtual ~ScDPCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} - ScDPObject* GetByName(const String& rName) const; + ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} + ScDPObject* GetByName(const String& rName) const; void DeleteOnTab( SCTAB nTab ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPCollection& r ) const; - void WriteRefsTo( ScDPCollection& r ) const; + BOOL RefsEqual( const ScDPCollection& r ) const; + void WriteRefsTo( ScDPCollection& r ) const; - String CreateNewName( USHORT nMin = 1 ) const; + String CreateNewName( USHORT nMin = 1 ) const; void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index e97a56a9ecf2..c35cd149a344 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -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 @@ -72,59 +72,59 @@ struct ScDPGetPivotDataField -class ScDPOutput //! name??? +class ScDPOutput //! name??? { private: - //! use impl-object? - ScDocument* pDoc; + //! use impl-object? + ScDocument* pDoc; com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier> xSource; - ScAddress aStartPos; - BOOL bDoFilter; - ScDPOutLevelData* pColFields; - ScDPOutLevelData* pRowFields; - ScDPOutLevelData* pPageFields; - long nColFieldCount; - long nRowFieldCount; - long nPageFieldCount; + ScAddress aStartPos; + BOOL bDoFilter; + ScDPOutLevelData* pColFields; + ScDPOutLevelData* pRowFields; + ScDPOutLevelData* pPageFields; + long nColFieldCount; + long nRowFieldCount; + long nPageFieldCount; com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> > aData; - BOOL bResultsError; + BOOL bResultsError; bool mbHasDataLayout; - String aDataDescription; + String aDataDescription; // Number format related parameters - UINT32* pColNumFmt; - UINT32* pRowNumFmt; - long nColFmtCount; - long nRowFmtCount; + UINT32* pColNumFmt; + UINT32* pRowNumFmt; + long nColFmtCount; + long nRowFmtCount; UINT32 nSingleNumFmt; // Output geometry related parameters - BOOL bSizesValid; - BOOL bSizeOverflow; - long nColCount; - long nRowCount; - long nHeaderSize; + BOOL bSizesValid; + BOOL bSizeOverflow; + long nColCount; + long nRowCount; + long nHeaderSize; bool mbHeaderLayout; // TRUE : grid, FALSE : standard - SCCOL nTabStartCol; - SCROW nTabStartRow; - SCCOL nMemberStartCol; - SCROW nMemberStartRow; - SCCOL nDataStartCol; - SCROW nDataStartRow; - SCCOL nTabEndCol; - SCROW nTabEndRow; - - void DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, + SCCOL nTabStartCol; + SCROW nTabStartRow; + SCCOL nMemberStartCol; + SCROW nMemberStartRow; + SCCOL nDataStartCol; + SCROW nDataStartRow; + SCCOL nTabEndCol; + SCROW nTabEndRow; + + void DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const com::sun::star::sheet::DataResult& rData ); - void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, + void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const com::sun::star::sheet::MemberResult& rData, BOOL bColHeader, long nLevel ); - void FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, + void FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, bool bInTable, bool bPopup, bool bHasHiddenMember ); - void CalcSizes(); + void CalcSizes(); /** Query which sub-area of the table the cell is in. See css.sheet.DataPilotTablePositionType for the interpretation of the @@ -138,12 +138,12 @@ public: const ScAddress& rPos, BOOL bFilter ); ~ScDPOutput(); - void SetPosition( const ScAddress& rPos ); + void SetPosition( const ScAddress& rPos ); - void Output(); //! Refresh? - ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); - long GetHeaderRows(); - BOOL HasError(); // range overflow or exception from source + void Output(); //! Refresh? + ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); + long GetHeaderRows(); + BOOL HasError(); // range overflow or exception from source void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); @@ -153,11 +153,11 @@ public: BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); + BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + BOOL IsFilterButton( const ScAddress& rPos ); void GetMemberResultNames( ScStrCollection& rNames, long nDimension ); diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx index 7069787e803d..02c6db48b6a2 100644 --- a/sc/inc/dpoutputgeometry.hxx +++ b/sc/inc/dpoutputgeometry.hxx @@ -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 @@ -42,8 +42,8 @@ public: ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType); ~ScDPOutputGeometry(); - /** - * @param nCount number of row fields, excluding the data layout + /** + * @param nCount number of row fields, excluding the data layout * field if exists. */ void setRowFieldCount(sal_uInt32 nCount); diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index bfff0b97a168..5651930f9711 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -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 @@ -49,31 +49,31 @@ class ScDPTableData; // -------------------------------------------------------------------- // -// classes to save Data Pilot settings +// classes to save Data Pilot settings // class ScDPSaveMember { private: - String aName; + String aName; ::std::auto_ptr mpLayoutName; // custom name to be displayed in the table. - USHORT nVisibleMode; - USHORT nShowDetailsMode; + USHORT nVisibleMode; + USHORT nShowDetailsMode; public: ScDPSaveMember(const String& rName); ScDPSaveMember(const ScDPSaveMember& r); ~ScDPSaveMember(); - BOOL operator== ( const ScDPSaveMember& r ) const; + BOOL operator== ( const ScDPSaveMember& r ) const; const String& GetName() const { return aName; } BOOL HasIsVisible() const; - SC_DLLPUBLIC void SetIsVisible(BOOL bSet); + SC_DLLPUBLIC void SetIsVisible(BOOL bSet); BOOL GetIsVisible() const { return BOOL(nVisibleMode); } BOOL HasShowDetails() const; - SC_DLLPUBLIC void SetShowDetails(BOOL bSet); + SC_DLLPUBLIC void SetShowDetails(BOOL bSet); BOOL GetShowDetails() const { return BOOL(nShowDetailsMode); } void SetName( const String& rNew ); // used if the source member was renamed (groups) @@ -82,7 +82,7 @@ public: SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; void RemoveLayoutName(); - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xMember, sal_Int32 nPosition ); }; @@ -94,27 +94,27 @@ bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, con class SC_DLLPUBLIC ScDPSaveDimension { private: - String aName; - String* pSelectedPage; + String aName; + String* pSelectedPage; ::std::auto_ptr mpLayoutName; ::std::auto_ptr mpSubtotalName; - BOOL bIsDataLayout; - BOOL bDupFlag; - USHORT nOrientation; - USHORT nFunction; // enum GeneralFunction, for data dimensions - long nUsedHierarchy; - USHORT nShowEmptyMode; //! at level - BOOL bSubTotalDefault; //! at level - long nSubTotalCount; - USHORT* pSubTotalFuncs; // enum GeneralFunction + BOOL bIsDataLayout; + BOOL bDupFlag; + USHORT nOrientation; + USHORT nFunction; // enum GeneralFunction, for data dimensions + long nUsedHierarchy; + USHORT nShowEmptyMode; //! at level + BOOL bSubTotalDefault; //! at level + long nSubTotalCount; + USHORT* pSubTotalFuncs; // enum GeneralFunction ::com::sun::star::sheet::DataPilotFieldReference* pReferenceValue; ::com::sun::star::sheet::DataPilotFieldSortInfo* pSortInfo; // (level) ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo; // (level) ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: - typedef std::hash_map MemberHash; - typedef std::list MemberList; + typedef std::hash_map MemberHash; + typedef std::list MemberList; private: MemberHash maMemberHash; MemberList maMemberList; @@ -123,28 +123,28 @@ public: ScDPSaveDimension(const ScDPSaveDimension& r); ~ScDPSaveDimension(); - BOOL operator== ( const ScDPSaveDimension& r ) const; + BOOL operator== ( const ScDPSaveDimension& r ) const; const MemberList& GetMembers() const { return maMemberList; } - void AddMember(ScDPSaveMember* pMember); + void AddMember(ScDPSaveMember* pMember); - void SetDupFlag(BOOL bSet) { bDupFlag = bSet; } - BOOL GetDupFlag() const { return bDupFlag; } + void SetDupFlag(BOOL bSet) { bDupFlag = bSet; } + BOOL GetDupFlag() const { return bDupFlag; } - const String& GetName() const { return aName; } - BOOL IsDataLayout() const { return bIsDataLayout; } + const String& GetName() const { return aName; } + BOOL IsDataLayout() const { return bIsDataLayout; } void SetName( const String& rNew ); // used if the source dim was renamed (groups) - void SetOrientation(USHORT nNew); - void SetSubTotals(long nCount, const USHORT* pFuncs); + void SetOrientation(USHORT nNew); + void SetSubTotals(long nCount, const USHORT* pFuncs); long GetSubTotalsCount() const { return nSubTotalCount; } USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } - void SetShowEmpty(BOOL bSet); + void SetShowEmpty(BOOL bSet); BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); } - void SetFunction(USHORT nNew); // enum GeneralFunction + void SetFunction(USHORT nNew); // enum GeneralFunction USHORT GetFunction() const { return nFunction; } - void SetUsedHierarchy(long nNew); + void SetUsedHierarchy(long nNew); long GetUsedHierarchy() const { return nUsedHierarchy; } void SetLayoutName(const ::rtl::OUString& rName); @@ -155,8 +155,8 @@ public: bool IsMemberNameInUse(const ::rtl::OUString& rName) const; - const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } - void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); + const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } + void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; } void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew); @@ -165,22 +165,22 @@ public: const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; } void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew); - void SetCurrentPage( const String* pPage ); // NULL = no selection (all) - BOOL HasCurrentPage() const; - const String& GetCurrentPage() const; + void SetCurrentPage( const String* pPage ); // NULL = no selection (all) + BOOL HasCurrentPage() const; + const String& GetCurrentPage() const; - USHORT GetOrientation() const { return nOrientation; } + USHORT GetOrientation() const { return nOrientation; } - ScDPSaveMember* GetExistingMemberByName(const String& rName); - ScDPSaveMember* GetMemberByName(const String& rName); + ScDPSaveMember* GetExistingMemberByName(const String& rName); + ScDPSaveMember* GetMemberByName(const String& rName); void SetMemberPosition( const String& rName, sal_Int32 nNewPos ); - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xDim ); - void Refresh( const com::sun::star::uno::Reference< + void Refresh( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource , - const std::list & deletedDims); + const std::list & deletedDims); void UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); @@ -191,12 +191,12 @@ public: class ScDPSaveData { private: - List aDimList; + List aDimList; ScDPDimensionSaveData* pDimensionData; // settings that create new dimensions - USHORT nColumnGrandMode; - USHORT nRowGrandMode; - USHORT nIgnoreEmptyMode; - USHORT nRepeatEmptyMode; + USHORT nColumnGrandMode; + USHORT nRowGrandMode; + USHORT nIgnoreEmptyMode; + USHORT nRepeatEmptyMode; BOOL bFilterButton; // not passed to DataPilotSource BOOL bDrillDown; // not passed to DataPilotSource // Wang Xu Ming -- 2009-8-17 @@ -206,34 +206,34 @@ private: /** if true, all dimensions already have all of their member instances * created. */ - bool mbDimensionMembersBuilt; + bool mbDimensionMembersBuilt; ::std::auto_ptr mpGrandTotalName; public: - SC_DLLPUBLIC ScDPSaveData(); + SC_DLLPUBLIC ScDPSaveData(); ScDPSaveData(const ScDPSaveData& r); - SC_DLLPUBLIC ~ScDPSaveData(); + SC_DLLPUBLIC ~ScDPSaveData(); - ScDPSaveData& operator= ( const ScDPSaveData& r ); + ScDPSaveData& operator= ( const ScDPSaveData& r ); - BOOL operator== ( const ScDPSaveData& r ) const; + BOOL operator== ( const ScDPSaveData& r ) const; SC_DLLPUBLIC void SetGrandTotalName(const ::rtl::OUString& rName); SC_DLLPUBLIC const ::rtl::OUString* GetGrandTotalName() const; - const List& GetDimensions() const { return aDimList; } - void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); } + const List& GetDimensions() const { return aDimList; } + void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); } - ScDPSaveDimension* GetDimensionByName(const String& rName); - SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); + ScDPSaveDimension* GetDimensionByName(const String& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); SC_DLLPUBLIC ScDPSaveDimension* GetExistingDataLayoutDimension() const; - ScDPSaveDimension* DuplicateDimension(const String& rName); + ScDPSaveDimension* DuplicateDimension(const String& rName); SC_DLLPUBLIC ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim); - SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const String& rName) const; - SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const String& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const String& rName) const; + SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const String& rName); void RemoveDimensionByName(const String& rName); @@ -242,28 +242,28 @@ public: long GetDataDimensionCount() const; - void SetPosition( ScDPSaveDimension* pDim, long nNew ); - SC_DLLPUBLIC void SetColumnGrand( BOOL bSet ); - BOOL GetColumnGrand() const { return BOOL(nColumnGrandMode); } - SC_DLLPUBLIC void SetRowGrand( BOOL bSet ); - BOOL GetRowGrand() const { return BOOL(nRowGrandMode); } - void SetIgnoreEmptyRows( BOOL bSet ); - BOOL GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); } - void SetRepeatIfEmpty( BOOL bSet ); - BOOL GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); } + void SetPosition( ScDPSaveDimension* pDim, long nNew ); + SC_DLLPUBLIC void SetColumnGrand( BOOL bSet ); + BOOL GetColumnGrand() const { return BOOL(nColumnGrandMode); } + SC_DLLPUBLIC void SetRowGrand( BOOL bSet ); + BOOL GetRowGrand() const { return BOOL(nRowGrandMode); } + void SetIgnoreEmptyRows( BOOL bSet ); + BOOL GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); } + void SetRepeatIfEmpty( BOOL bSet ); + BOOL GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); } SC_DLLPUBLIC void SetFilterButton( BOOL bSet ); BOOL GetFilterButton() const { return bFilterButton; } SC_DLLPUBLIC void SetDrillDown( BOOL bSet ); BOOL GetDrillDown() const { return bDrillDown; } - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void Refresh( const com::sun::star::uno::Reference< + void Refresh( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); - BOOL IsEmpty() const; + BOOL IsEmpty() const; inline long GetCacheId() const{ return mnCacheId; } inline void SetCacheId( long nCacheId ){ mnCacheId = nCacheId; } // End Comments @@ -272,7 +272,7 @@ public: void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied void BuildAllDimensionMembers(ScDPTableData* pData); - /** + /** * Check whether a dimension has one or more invisible members. * * @param rDimName dimension name diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 732e3d30e8df..b17574eace4d 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -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 @@ -40,19 +40,19 @@ class ScDocument; // -------------------------------------------------------------------- // -// implementation of ScDPTableData with database data +// implementation of ScDPTableData with database data // struct ScImportSourceDesc { - String aDBName; - String aObject; - USHORT nType; // enum DataImportMode - BOOL bNative; + String aDBName; + String aObject; + USHORT nType; // enum DataImportMode + BOOL bNative; ScImportSourceDesc() : nType(0), bNative(FALSE) {} - BOOL operator== ( const ScImportSourceDesc& rOther ) const + BOOL operator== ( const ScImportSourceDesc& rOther ) const { return aDBName == rOther.aDBName && aObject == rOther.aObject && nType == rOther.nType && @@ -63,7 +63,7 @@ struct ScImportSourceDesc ScDPTableDataCache* GetExistDPObjectCache( ScDocument* pDoc ) const; ScDPTableDataCache* CreateCache( ScDocument* pDoc , long nID ) const; ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const; - long GetCacheId( ScDocument* pDoc, long nID ) const; + long GetCacheId( ScDocument* pDoc, long nID ) const; // End Comments }; @@ -73,14 +73,14 @@ private: ScDPCacheTable aCacheTable; public: ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport, long nCacheId = -1); - virtual ~ScDatabaseDPData(); - - virtual long GetColumnCount(); - virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual ~ScDatabaseDPData(); + + virtual long GetColumnCount(); + virtual String getDimensionName(long nColumn); + virtual BOOL getIsDataLayoutDimension(long nColumn); + virtual BOOL IsDateDimension(long nDim); + virtual void DisposeData(); + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); virtual void CreateCacheTable(); virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::hash_set& rDataDims); diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index a8d80072c68a..e312e13f23fc 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -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 @@ -47,15 +47,15 @@ class ScDPItemData; // End Comments // -------------------------------------------------------------------- // -// implementation of ScDPTableData with sheet data +// implementation of ScDPTableData with sheet data // struct ScSheetSourceDesc { - ScRange aSourceRange; - ScQueryParam aQueryParam; + ScRange aSourceRange; + ScQueryParam aQueryParam; - BOOL operator== ( const ScSheetSourceDesc& rOther ) const + BOOL operator== ( const ScSheetSourceDesc& rOther ) const { return aSourceRange == rOther.aSourceRange && aQueryParam == rOther.aQueryParam; } // Wang Xu Ming - DataPilot migration @@ -64,34 +64,34 @@ struct ScSheetSourceDesc ULONG CheckValidate( ScDocument* pDoc ) const; ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const; ScDPTableDataCache* GetExistDPObjectCache ( ScDocument* pDoc ) const; - long GetCacheId( ScDocument* pDoc, long nID ) const; - + long GetCacheId( ScDocument* pDoc, long nID ) const; + // End Comments }; class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData { private: - ScQueryParam aQuery; - BOOL* pSpecial; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; + ScQueryParam aQuery; + BOOL* pSpecial; + BOOL bIgnoreEmptyRows; + BOOL bRepeatIfEmpty; - ScDPCacheTable aCacheTable; + ScDPCacheTable aCacheTable; public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc, long nCacheId = -1 ); - virtual ~ScSheetDPData(); + virtual ~ScSheetDPData(); // End Comments - virtual long GetColumnCount(); - virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual ULONG GetNumberFormat(long nDim); - virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual long GetColumnCount(); + virtual String getDimensionName(long nColumn); + virtual BOOL getIsDataLayoutDimension(long nColumn); + virtual BOOL IsDateDimension(long nDim); + virtual ULONG GetNumberFormat(long nDim); + virtual void DisposeData(); + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); virtual bool IsRepeatIfEmpty(); diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 6323434ca4ad..fc427e3134ca 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -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 @@ -49,40 +49,40 @@ namespace com { namespace sun { namespace star { namespace sheet { // ----------------------------------------------------------------------- -#define SC_DAPI_DATE_HIERARCHIES 3 +#define SC_DAPI_DATE_HIERARCHIES 3 -#define SC_DAPI_HIERARCHY_FLAT 0 -#define SC_DAPI_HIERARCHY_QUARTER 1 -#define SC_DAPI_HIERARCHY_WEEK 2 +#define SC_DAPI_HIERARCHY_FLAT 0 +#define SC_DAPI_HIERARCHY_QUARTER 1 +#define SC_DAPI_HIERARCHY_WEEK 2 -#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates -#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy -#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy +#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates +#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy +#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy -#define SC_DAPI_LEVEL_YEAR 0 -#define SC_DAPI_LEVEL_QUARTER 1 -#define SC_DAPI_LEVEL_MONTH 2 -#define SC_DAPI_LEVEL_DAY 3 -#define SC_DAPI_LEVEL_WEEK 1 -#define SC_DAPI_LEVEL_WEEKDAY 2 +#define SC_DAPI_LEVEL_YEAR 0 +#define SC_DAPI_LEVEL_QUARTER 1 +#define SC_DAPI_LEVEL_MONTH 2 +#define SC_DAPI_LEVEL_DAY 3 +#define SC_DAPI_LEVEL_WEEK 1 +#define SC_DAPI_LEVEL_WEEKDAY 2 // -------------------------------------------------------------------- // -// base class ScDPTableData to allow implementation with tabular data -// by deriving only of this +// base class ScDPTableData to allow implementation with tabular data +// by deriving only of this // -#define SC_VALTYPE_EMPTY 0 -#define SC_VALTYPE_VALUE 1 -#define SC_VALTYPE_STRING 2 -#define SC_VALTYPE_ERROR 3 +#define SC_VALTYPE_EMPTY 0 +#define SC_VALTYPE_VALUE 1 +#define SC_VALTYPE_STRING 2 +#define SC_VALTYPE_ERROR 3 struct ScDPValueData { - double fValue; - BYTE nType; + double fValue; + BYTE nType; - void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } + void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } }; class ScDPResultMember; @@ -94,11 +94,11 @@ class ScDocument; class SC_DLLPUBLIC ScDPTableData { - // cached data for GetDatePart - long nLastDateVal; - long nLastHier; - long nLastLevel; - long nLastRet; + // cached data for GetDatePart + long nLastDateVal; + long nLastHier; + long nLastLevel; + long nLastRet; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance long mnCacheId; @@ -133,26 +133,26 @@ public: // DataPilot Migration - Cache&&Performance ScDPTableData(ScDocument* pDoc, long nCacheId ); // End Comments - virtual ~ScDPTableData(); + virtual ~ScDPTableData(); - long GetDatePart( long nDateVal, long nHierarchy, long nLevel ); + long GetDatePart( long nDateVal, long nHierarchy, long nLevel ); - //! use (new) typed collection instead of ScStrCollection - //! or separate Str and ValueCollection + //! use (new) typed collection instead of ScStrCollection + //! or separate Str and ValueCollection - virtual long GetColumnCount() = 0; + virtual long GetColumnCount() = 0; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; long GetCacheId() const; // End Comments - virtual String getDimensionName(long nColumn) = 0; - virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; - virtual BOOL IsDateDimension(long nDim) = 0; - virtual ULONG GetNumberFormat(long nDim); - virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); - virtual void DisposeData() = 0; - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; + virtual String getDimensionName(long nColumn) = 0; + virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; + virtual BOOL IsDateDimension(long nDim) = 0; + virtual ULONG GetNumberFormat(long nDim); + virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); + virtual void DisposeData() = 0; + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; virtual bool IsRepeatIfEmpty(); @@ -179,8 +179,8 @@ public: virtual const ScDPItemData* GetMemberByIndex( long nDim, long nIndex ); virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual SCROW GetIdOfItemData( long nDim, const ScDPItemData& rData ); - virtual long GetSourceDim( long nDim ); - virtual long Compare( long nDim, long nDataId1, long nDataId2); + virtual long GetSourceDim( long nDim ); + virtual long Compare( long nDim, long nDataId1, long nDataId2); // End Comments protected: /** This structure stores vector arrays that hold intermediate data for @@ -192,7 +192,7 @@ protected: ::std::vector< SCROW > aColData; ::std::vector< SCROW > aRowData; ::std::vector< SCROW > aPageData; - // End Comments + // End Comments ::std::vector aValues; }; @@ -203,7 +203,7 @@ protected: private: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, + void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, const ::std::vector& rDims, ::std::vector< SCROW >& rItemData); // End Comments }; diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx index 953c793093be..202ab64f045f 100644 --- a/sc/inc/dptablecache.hxx +++ b/sc/inc/dptablecache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -51,32 +51,32 @@ struct ScQueryParam; // -------------------------------------------------------------------- // -// base class ScDPTableData to allow implementation with tabular data -// by deriving only of this +// base class ScDPTableData to allow implementation with tabular data +// by deriving only of this // class SC_DLLPUBLIC ScDPTableDataCache { - long mnID; + long mnID; ScDocument* mpDoc; - long mnColumnCount; // Column count + long mnColumnCount; // Column count - std::vector* mpTableDataValues; //Data Pilot Table's index - value map - std::vector* mpSourceData; //Data Pilot Table's Source data - std::vector* mpGlobalOrder; //Sorted members index - std::vector* mpIndexOrder; //Index the sorted number - std::vector mrLabelNames; //Source Label data - std::vector mbEmptyRow; //If empty row? - mutable ScDPItemDataPool maAdditionalDatas; + std::vector* mpTableDataValues; //Data Pilot Table's index - value map + std::vector* mpSourceData; //Data Pilot Table's Source data + std::vector* mpGlobalOrder; //Sorted members index + std::vector* mpIndexOrder; //Index the sorted number + std::vector mrLabelNames; //Source Label data + std::vector mbEmptyRow; //If empty row? + mutable ScDPItemDataPool maAdditionalDatas; public: SCROW GetOrder( long nDim, SCROW nIndex ) const; SCROW GetIdByItemData( long nDim, String sItemData ) const; SCROW GetIdByItemData( long nDim, const ScDPItemData& rData ) const; - + SCROW GetAdditionalItemID ( String sItemData ); - SCROW GetAdditionalItemID( const ScDPItemData& rData ); - + SCROW GetAdditionalItemID( const ScDPItemData& rData ); + SCCOL GetDimensionIndex( String sName) const; const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const; ULONG GetNumType ( ULONG nFormat ) const; @@ -87,22 +87,22 @@ public: SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const; const std::vector& GetDimMemberValues( SCCOL nDim )const; - void SetId( long nId ){ mnID = nId;} - void AddRow( ScDPItemData* pRow, USHORT nCount ); - bool InitFromDoc( ScDocument* pDoc, const ScRange& rRange ); + void SetId( long nId ){ mnID = nId;} + void AddRow( ScDPItemData* pRow, USHORT nCount ); + bool InitFromDoc( ScDocument* pDoc, const ScRange& rRange ); bool InitFromDataBase (const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate); - SCROW GetRowCount() const; - SCROW GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const; - String GetDimensionName( USHORT nColumn ) const; - bool IsEmptyMember( SCROW nRow, USHORT nColumn ) const; - bool IsRowEmpty( SCROW nRow ) const; - bool IsValid() const; - bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial ); + SCROW GetRowCount() const; + SCROW GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const; + String GetDimensionName( USHORT nColumn ) const; + bool IsEmptyMember( SCROW nRow, USHORT nColumn ) const; + bool IsRowEmpty( SCROW nRow ) const; + bool IsValid() const; + bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial ); ScDocument* GetDoc() const;//ms-cache-core long GetColumnCount() const; - long GetId() const; + long GetId() const; const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const; @@ -115,8 +115,8 @@ public: protected: private: - void AddLabel( ScDPItemData* pData); - BOOL AddData( long nDim, ScDPItemData* itemData ); + void AddLabel( ScDPItemData* pData); + BOOL AddData( long nDim, ScDPItemData* itemData ); }; #endif //DPTABLECACHE_HXX diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 7f9720a4b143..591d3835d878 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -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 @@ -33,7 +33,7 @@ #include #include #include -#include "global.hxx" // enum ScSubTotalFunc +#include "global.hxx" // enum ScSubTotalFunc #include "dpcachetable.hxx" #include #include @@ -94,7 +94,7 @@ public: typedef ::std::vector ScMemberSortOrder; // -// selected subtotal information, passed down the dimensions +// selected subtotal information, passed down the dimensions // struct ScDPSubTotalState @@ -158,8 +158,8 @@ struct ScDPRelativePos }; // -// aggregated data -//! separate header file? +// aggregated data +//! separate header file? // // Possible values for the nCount member: @@ -173,34 +173,34 @@ const long SC_DPAGG_RESULT_ERROR = -4; // error in calculated result class ScDPAggData { private: - double fVal; - double fAux; - long nCount; - ScDPAggData* pChild; + double fVal; + double fAux; + long nCount; + ScDPAggData* pChild; public: ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(NULL) {} ~ScDPAggData() { delete pChild; } - void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); - void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); - BOOL IsCalculated() const; + void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); + void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); + BOOL IsCalculated() const; - double GetResult() const; - BOOL HasError() const; - BOOL HasData() const; + double GetResult() const; + BOOL HasError() const; + BOOL HasData() const; - void SetResult( double fNew ); - void SetEmpty( BOOL bSet ); - void SetError(); + void SetResult( double fNew ); + void SetEmpty( BOOL bSet ); + void SetError(); - double GetAuxiliary() const; - void SetAuxiliary( double fNew ); + double GetAuxiliary() const; + void SetAuxiliary( double fNew ); void Reset(); // also deletes children - const ScDPAggData* GetExistingChild() const { return pChild; } - ScDPAggData* GetChild(); + const ScDPAggData* GetExistingChild() const { return pChild; } + ScDPAggData* GetChild(); }; // @@ -226,17 +226,17 @@ public: // -------------------------------------------------------------------- // -// results for a hierarchy dimension +// results for a hierarchy dimension // -#define SC_DP_RES_GROW 16 +#define SC_DP_RES_GROW 16 class ScDPResultDimension; class ScDPDataDimension; class ScDPDataMember; -#define SC_DPMEASURE_ALL -1 -#define SC_DPMEASURE_ANY -2 +#define SC_DPMEASURE_ALL -1 +#define SC_DPMEASURE_ANY -2 // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -248,10 +248,10 @@ struct MemberHashIndexFunc : public std::unary_function< const SCROW &, size_t > class ScDPParentDimData { public: - const SCROW mnOrder; //! Ref - const ScDPDimension* mpParentDim; //! Ref - const ScDPLevel* mpParentLevel; //! Ref - const ScDPMember* mpMemberDesc; //! Ref + const SCROW mnOrder; //! Ref + const ScDPDimension* mpParentDim; //! Ref + const ScDPLevel* mpParentLevel; //! Ref + const ScDPMember* mpMemberDesc; //! Ref ScDPParentDimData():mnOrder(-1), mpParentDim( NULL), mpParentLevel( NULL ), mpMemberDesc( NULL ){} ScDPParentDimData( const SCROW nIndex, ScDPDimension* pDim, const ScDPLevel* pLev, const ScDPMember* pMember ): mnOrder( nIndex ), mpParentDim( pDim), mpParentLevel( pLev ), mpMemberDesc( pMember ){} @@ -263,12 +263,12 @@ typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMem class ResultMembers { DimMemberHash maMemberHash; - BOOL mbHasHideDetailsMember; + BOOL mbHasHideDetailsMember; public: ScDPParentDimData* FindMember( const SCROW& nIndex ) const; void InsertMember( ScDPParentDimData* pNew ); - BOOL IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } - void SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; } + BOOL IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } + void SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; } ResultMembers(); virtual ~ResultMembers(); }; @@ -283,7 +283,7 @@ private: BOOL mbInitChild; BOOL mbAllChildren; public: - LateInitParams( const ::std::vector& ppDim, const ::std::vector& ppLev, + LateInitParams( const ::std::vector& ppDim, const ::std::vector& ppLev, BOOL bRow, BOOL bInitChild = TRUE , BOOL bAllChildren = FALSE); ~LateInitParams(); @@ -303,45 +303,45 @@ public: class ScDPResultData { private: - ScDPSource* pSource; //! Ref - //! keep things like measure lists here + ScDPSource* pSource; //! Ref + //! keep things like measure lists here - long nMeasCount; - ScSubTotalFunc* pMeasFuncs; + long nMeasCount; + ScSubTotalFunc* pMeasFuncs; ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs; - USHORT* pMeasRefOrient; - String* pMeasNames; - BOOL bLateInit; - BOOL bDataAtCol; - BOOL bDataAtRow; + USHORT* pMeasRefOrient; + String* pMeasNames; + BOOL bLateInit; + BOOL bDataAtCol; + BOOL bDataAtRow; //! add "displayed values" settings mutable std::vector< ResultMembers* > mpDimMembers; public: - ScDPResultData( ScDPSource* pSrc ); //! Ref + ScDPResultData( ScDPSource* pSrc ); //! Ref ~ScDPResultData(); - void SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions, + void SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions, const ::com::sun::star::sheet::DataPilotFieldReference* pRefs, const USHORT* pRefOrient, const String* pNames ); - void SetDataLayoutOrientation( USHORT nOrient ); - void SetLateInit( BOOL bSet ); + void SetDataLayoutOrientation( USHORT nOrient ); + void SetLateInit( BOOL bSet ); - long GetMeasureCount() const { return nMeasCount; } - ScSubTotalFunc GetMeasureFunction(long nMeasure) const; + long GetMeasureCount() const { return nMeasCount; } + ScSubTotalFunc GetMeasureFunction(long nMeasure) const; String GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; - String GetMeasureDimensionName(long nMeasure) const; + String GetMeasureDimensionName(long nMeasure) const; const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; - USHORT GetMeasureRefOrient(long nMeasure) const; + USHORT GetMeasureRefOrient(long nMeasure) const; - BOOL IsDataAtCol() const { return bDataAtCol; } - BOOL IsDataAtRow() const { return bDataAtRow; } - BOOL IsLateInit() const { return bLateInit; } + BOOL IsDataAtCol() const { return bDataAtCol; } + BOOL IsDataAtRow() const { return bDataAtRow; } + BOOL IsLateInit() const { return bLateInit; } - long GetColStartMeasure() const; - long GetRowStartMeasure() const; + long GetColStartMeasure() const; + long GetRowStartMeasure() const; - long GetCountForMeasure( long nMeas ) const + long GetCountForMeasure( long nMeas ) const { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; } BOOL IsBaseForGroup( long nDim ) const; // any group @@ -371,16 +371,16 @@ private: // DataPilot Migration - Cache&&Performance ScDPParentDimData aParentDimData; // End Comments - ScDPResultDimension* pChildDimension; - ScDPDataMember* pDataRoot; - BOOL bHasElements; - BOOL bForceSubTotal; - BOOL bHasHiddenDetails; - BOOL bInitialized; + ScDPResultDimension* pChildDimension; + ScDPDataMember* pDataRoot; + BOOL bHasElements; + BOOL bForceSubTotal; + BOOL bHasHiddenDetails; + BOOL bInitialized; BOOL bAutoHidden; - ScDPAggData aColTotal; // to store column totals + ScDPAggData aColTotal; // to store column totals - USHORT nMemberStep; // step to show details + USHORT nMemberStep; // step to show details public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -392,28 +392,28 @@ public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void InitFrom( const ::std::vector& ppDim, + void InitFrom( const ::std::vector& ppDim, const ::std::vector& ppLev, - size_t nPos, - ScDPInitState& rInitState, + size_t nPos, + ScDPInitState& rInitState, BOOL bInitChild = TRUE ); - void LateInitFrom( - LateInitParams& rParams, + void LateInitFrom( + LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState); void CheckShowEmpty( BOOL bShow = FALSE ); // End Comments - String GetName() const; + String GetName() const; void FillItemData( ScDPItemData& rData ) const; - BOOL IsValid() const; - BOOL IsVisible() const; - long GetSize(long nMeasure) const; - BOOL HasHiddenDetails() const; + BOOL IsValid() const; + BOOL IsVisible() const; + long GetSize(long nMeasure) const; + BOOL HasHiddenDetails() const; BOOL IsSubTotalInTitle(long nMeasure) const; -// BOOL SubTotalEnabled() const; - long GetSubTotalCount( long* pUserSubStart = NULL ) const; +// BOOL SubTotalEnabled() const; + long GetSubTotalCount( long* pUserSubStart = NULL ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -421,7 +421,7 @@ public: bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const; // End Comments - void SetHasElements() { bHasElements = TRUE; } + void SetHasElements() { bHasElements = TRUE; } void SetAutoHidden() { bAutoHidden = TRUE; } // Wang Xu Ming -- 2009-8-17 @@ -431,20 +431,20 @@ public: const ::std::vector& aDataMembers, const ::std::vector& aValues ); // End Comments - void FillMemberResults( com::sun::star::uno::Sequence< + void FillMemberResults( com::sun::star::uno::Sequence< com::sun::star::sheet::MemberResult>* pSequences, long& rPos, long nMeasure, BOOL bRoot, const String* pMemberName, const String* pMemberCaption ); - void FillDataResults( const ScDPResultMember* pRefMember, + void FillDataResults( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> >& rSequence, long& rRow, long nMeasure ) const; - void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, + void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals ) const; void SortMembers( ScDPResultMember* pRefMember ); @@ -452,13 +452,13 @@ public: void ResetResults( BOOL bRoot ); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - //! this will be removed! - const ScDPResultDimension* GetChildDimension() const { return pChildDimension; } - ScDPResultDimension* GetChildDimension() { return pChildDimension; } + //! this will be removed! + const ScDPResultDimension* GetChildDimension() const { return pChildDimension; } + ScDPResultDimension* GetChildDimension() { return pChildDimension; } - ScDPDataMember* GetDataRoot() const { return pDataRoot; } + ScDPDataMember* GetDataRoot() const { return pDataRoot; } // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -469,7 +469,7 @@ public: inline BOOL IsRoot() const { return GetParentLevel() == NULL; } SCROW GetDataId( ) const ; // End Comments - ScDPAggData* GetColTotal( long nMeasure ) const; + ScDPAggData* GetColTotal( long nMeasure ) const; void FillVisibilityData(ScDPResultVisibilityData& rData) const; }; @@ -478,9 +478,9 @@ class ScDPDataMember { private: const ScDPResultData* pResultData; - const ScDPResultMember* pResultMember; //! Ref? - ScDPDataDimension* pChildDimension; - ScDPAggData aAggregate; + const ScDPResultMember* pResultMember; //! Ref? + ScDPDataDimension* pChildDimension; + ScDPAggData aAggregate; void UpdateValues( const ::std::vector& aValues, const ScDPSubTotalState& rSubState ); @@ -488,36 +488,36 @@ public: ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ); ~ScDPDataMember(); - void InitFrom( const ScDPResultDimension* pDim ); + void InitFrom( const ScDPResultDimension* pDim ); - String GetName() const; - BOOL IsVisible() const; - BOOL HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; + String GetName() const; + BOOL IsVisible() const; + BOOL HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance BOOL IsNamedItem( SCROW r ) const; // End Comments - BOOL HasHiddenDetails() const; + BOOL HasHiddenDetails() const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance void ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector& aValues, const ScDPSubTotalState& rSubState ); // End Comments - BOOL HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; - double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const; - const ScDPAggData* GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const; - ScDPAggData* GetAggData( long nMeasure, const ScDPSubTotalState& rSubState ); + BOOL HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; + double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const; + const ScDPAggData* GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const; + ScDPAggData* GetAggData( long nMeasure, const ScDPSubTotalState& rSubState ); - void FillDataRow( const ScDPResultMember* pRefMember, + void FillDataRow( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence& rSequence, long& rCol, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ); - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ); @@ -526,20 +526,20 @@ public: void ResetResults(); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - //! this will be removed! - const ScDPDataDimension* GetChildDimension() const { return pChildDimension; } - ScDPDataDimension* GetChildDimension() { return pChildDimension; } + //! this will be removed! + const ScDPDataDimension* GetChildDimension() const { return pChildDimension; } + ScDPDataDimension* GetChildDimension() { return pChildDimension; } }; -//! replace PtrArr with 32-bit array ???? +//! replace PtrArr with 32-bit array ???? typedef ScDPDataMember* ScDPDataMemberPtr; SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW, SC_DP_RES_GROW) -// result dimension contains only members +// result dimension contains only members class ScDPResultDimension { @@ -551,11 +551,11 @@ public : // End Comments private: const ScDPResultData* pResultData; - MemberArray maMemberArray; - MemberHash maMemberHash; + MemberArray maMemberArray; + MemberHash maMemberHash; BOOL bInitialized; - String aDimensionName; //! or ptr to IntDimension? - BOOL bIsDataLayout; //! or ptr to IntDimension? + String aDimensionName; //! or ptr to IntDimension? + BOOL bIsDataLayout; //! or ptr to IntDimension? BOOL bSortByData; BOOL bSortAscending; long nSortMeasure; @@ -572,7 +572,7 @@ private: ScDPResultMember* InsertMember( ScDPParentDimData* pMemberData ); ResultMembers* GetResultMember( ScDPDimension* pDim, ScDPLevel* pLevel ); void InitWithMembers( LateInitParams& rParams, - const ::std::vector< SCROW >& pItemData, + const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ); // End Comments @@ -580,44 +580,44 @@ public: ScDPResultDimension( const ScDPResultData* pData ); ~ScDPResultDimension(); - // allocates new members + // allocates new members // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void InitFrom( const ::std::vector& ppDim, + void InitFrom( const ::std::vector& ppDim, const ::std::vector& ppLev, size_t nPos, ScDPInitState& rInitState , BOOL bInitChild = TRUE ); - void LateInitFrom( LateInitParams& rParams, + void LateInitFrom( LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ); void CheckShowEmpty( BOOL bShow = FALSE ); // End Comments - long GetSize(long nMeasure) const; + long GetSize(long nMeasure) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance bool IsValidEntry( const ::std::vector& aMembers ) const; - - // modifies existing members, allocates data dimensions - void ProcessData( const ::std::vector& aMembers, + + // modifies existing members, allocates data dimensions + void ProcessData( const ::std::vector& aMembers, const ScDPResultDimension* pDataDim, const ::std::vector& aDataMembers, - const ::std::vector& aValues ) const; //! Test + const ::std::vector& aValues ) const; //! Test // End Comments - void FillMemberResults( com::sun::star::uno::Sequence< + void FillMemberResults( com::sun::star::uno::Sequence< com::sun::star::sheet::MemberResult>* pSequences, long nStart, long nMeasure ); - void FillDataResults( const ScDPResultMember* pRefMember, + void FillDataResults( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> >& rSequence, long nRow, long nMeasure ) const; - void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, + void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals ) const; void SortMembers( ScDPResultMember* pRefMember ); @@ -627,26 +627,26 @@ public: void ResetResults(); - // called for the reference dimension - ScDPDataMember* GetRowReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, + // called for the reference dimension + ScDPDataMember* GetRowReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, const long* pRowIndexes, const long* pColIndexes ) const; - // uses row root member from ScDPRunningTotalState + // uses row root member from ScDPRunningTotalState static ScDPDataMember* GetColReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, long nRefDimPos, const ScDPRunningTotalState& rRunning ); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - // for ScDPDataDimension::InitFrom - long GetMemberCount() const; - const ScDPResultMember* GetMember(long n) const; - ScDPResultMember* GetMember(long n); + // for ScDPDataDimension::InitFrom + long GetMemberCount() const; + const ScDPResultMember* GetMember(long n) const; + ScDPResultMember* GetMember(long n); const ScMemberSortOrder& GetMemberOrder() const { return aMemberOrder; } ScMemberSortOrder& GetMemberOrder() { return aMemberOrder; } - BOOL IsDataLayout() const { return bIsDataLayout; } - String GetName() const { return aDimensionName; } + BOOL IsDataLayout() const { return bIsDataLayout; } + String GetName() const { return aDimensionName; } BOOL IsSortByData() const { return bSortByData; } BOOL IsSortAscending() const { return bSortAscending; } @@ -665,29 +665,29 @@ public: class ScDPDataDimension { private: - const ScDPResultData* pResultData; + const ScDPResultData* pResultData; const ScDPResultDimension* pResultDimension; // column - ScDPDataMembers aMembers; - BOOL bIsDataLayout; //! or ptr to IntDimension? + ScDPDataMembers aMembers; + BOOL bIsDataLayout; //! or ptr to IntDimension? public: ScDPDataDimension( const ScDPResultData* pData ); ~ScDPDataDimension(); - void InitFrom( const ScDPResultDimension* pDim ); // recursive + void InitFrom( const ScDPResultDimension* pDim ); // recursive // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance void ProcessData( const ::std::vector< SCROW >& aDataMembers, const ::std::vector& aValues, const ScDPSubTotalState& rSubState ); // End Comments - void FillDataRow( const ScDPResultDimension* pRefDim, + void FillDataRow( const ScDPResultDimension* pRefDim, com::sun::star::uno::Sequence& rSequence, long nCol, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ) const; @@ -698,15 +698,15 @@ public: void ResetResults(); - void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; - long GetMemberCount() const; - ScDPDataMember* GetMember(long n) const; + long GetMemberCount() const; + ScDPDataMember* GetMember(long n) const; }; // ---------------------------------------------------------------------------- -/** +/** * This class collects visible members of each dimension and uses that * information to create filtering criteria (e.g. for drill-down data). */ diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 18210f38e80e..a6bd64779bd4 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -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 @@ -37,7 +37,7 @@ #include #include #include -#include "global.hxx" // enum ScSubTotalFunc +#include "global.hxx" // enum ScSubTotalFunc #include #include #include @@ -67,7 +67,7 @@ // End Comments #include "dptabdat.hxx" -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; } @@ -87,13 +87,13 @@ class ScDPTableData; // ------------------------------------------------------------------------ -// should be dynamic! -#define SC_DAPI_MAXFIELDS 256 +// should be dynamic! +#define SC_DAPI_MAXFIELDS 256 // -------------------------------------------------------------------- // -// implementation of DataPilotSource using ScDPTableData +// implementation of DataPilotSource using ScDPTableData // @@ -116,72 +116,72 @@ class ScDPSource : public cppu::WeakImplHelper6< com::sun::star::lang::XServiceInfo > { private: - ScDPTableData* pData; // data source (ScDPObject manages its life time) - ScDPDimensions* pDimensions; // api objects + ScDPTableData* pData; // data source (ScDPObject manages its life time) + ScDPDimensions* pDimensions; // api objects // settings: - long nColDims[SC_DAPI_MAXFIELDS]; - long nRowDims[SC_DAPI_MAXFIELDS]; - long nDataDims[SC_DAPI_MAXFIELDS]; - long nPageDims[SC_DAPI_MAXFIELDS]; - long nColDimCount; - long nRowDimCount; - long nDataDimCount; - long nPageDimCount; - BOOL bColumnGrand; - BOOL bRowGrand; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; - - long nDupCount; + long nColDims[SC_DAPI_MAXFIELDS]; + long nRowDims[SC_DAPI_MAXFIELDS]; + long nDataDims[SC_DAPI_MAXFIELDS]; + long nPageDims[SC_DAPI_MAXFIELDS]; + long nColDimCount; + long nRowDimCount; + long nDataDimCount; + long nPageDimCount; + BOOL bColumnGrand; + BOOL bRowGrand; + BOOL bIgnoreEmptyRows; + BOOL bRepeatIfEmpty; + + long nDupCount; // results: - ScDPResultData* pResData; // keep the rest in this! - ScDPResultMember* pColResRoot; - ScDPResultMember* pRowResRoot; + ScDPResultData* pResData; // keep the rest in this! + ScDPResultMember* pColResRoot; + ScDPResultMember* pRowResRoot; com::sun::star::uno::Sequence* pColResults; com::sun::star::uno::Sequence* pRowResults; - List aColLevelList; - List aRowLevelList; - BOOL bResultOverflow; + List aColLevelList; + List aRowLevelList; + BOOL bResultOverflow; ::std::auto_ptr mpGrandTotalName; - void CreateRes_Impl(); - void FillMemberResults(); - void FillLevelList( USHORT nOrientation, List& rList ); + void CreateRes_Impl(); + void FillMemberResults(); + void FillLevelList( USHORT nOrientation, List& rList ); void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow); - /** - * Compile a list of dimension indices that are either, column, row or - * page dimensions (i.e. all but data dimensions). + /** + * Compile a list of dimension indices that are either, column, row or + * page dimensions (i.e. all but data dimensions). */ void GetCategoryDimensionIndices(::std::hash_set& rCatDims); - /** - * Set visibilities of individual rows in the cache table based on the - * page field data. + /** + * Set visibilities of individual rows in the cache table based on the + * page field data. */ void FilterCacheTableByPageDimensions(); - void SetDupCount( long nNew ); + void SetDupCount( long nNew ); public: - ScDPSource( ScDPTableData* pD ); // TableData is deleted by Source - virtual ~ScDPSource(); + ScDPSource( ScDPTableData* pD ); // TableData is deleted by Source + virtual ~ScDPSource(); - ScDPTableData* GetData() { return pData; } - const ScDPTableData* GetData() const { return pData; } + ScDPTableData* GetData() { return pData; } + const ScDPTableData* GetData() const { return pData; } void SetGrandTotalName(const ::rtl::OUString& rName); const ::rtl::OUString* GetGrandTotalName() const; - USHORT GetOrientation(long nColumn); - void SetOrientation(long nColumn, USHORT nNew); - long GetPosition(long nColumn); + USHORT GetOrientation(long nColumn); + void SetOrientation(long nColumn, USHORT nNew); + long GetPosition(long nColumn); - long GetDataDimensionCount(); + long GetDataDimensionCount(); ScDPDimension* GetDataDimension(long nIndex); - String GetDataDimName(long nIndex); + String GetDataDimName(long nIndex); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScDPTableDataCache* GetCache(); @@ -189,25 +189,25 @@ public: long GetDataLayoutDim(){ return pData->GetColumnCount(); } SCROW GetMemberId( long nDim, const ScDPItemData& rData ); // End Comments - BOOL IsDataLayoutDimension(long nDim); - USHORT GetDataLayoutOrientation(); + BOOL IsDataLayoutDimension(long nDim); + USHORT GetDataLayoutOrientation(); - BOOL IsDateDimension(long nDim); - UINT32 GetNumberFormat(long nDim); + BOOL IsDateDimension(long nDim); + UINT32 GetNumberFormat(long nDim); - BOOL SubTotalAllowed(long nColumn); //! move to ScDPResultData + BOOL SubTotalAllowed(long nColumn); //! move to ScDPResultData - ScDPDimension* AddDuplicated(long nSource, const String& rNewName); - long GetDupCount() const { return nDupCount; } + ScDPDimension* AddDuplicated(long nSource, const String& rNewName); + long GetDupCount() const { return nDupCount; } - long GetSourceDim(long nDim); + long GetSourceDim(long nDim); const com::sun::star::uno::Sequence* GetMemberResults( ScDPLevel* pLevel ); - ScDPDimensions* GetDimensionsObject(); + ScDPDimensions* GetDimensionsObject(); -//UNUSED2009-05 void DumpState( ScDocument* pDoc, const ScAddress& rPos ); +//UNUSED2009-05 void DumpState( ScDocument* pDoc, const ScAddress& rPos ); // XDimensionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > @@ -220,17 +220,17 @@ public: throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); // XDrillDownDataSupplier - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > - SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > + SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& aFilters ) throw(::com::sun::star::uno::RuntimeException); @@ -238,7 +238,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -250,25 +250,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -283,20 +283,20 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual String getDataDescription(); //! ??? + virtual String getDataDescription(); //! ??? - virtual BOOL getColumnGrand() const; - virtual void setColumnGrand(BOOL bSet); - virtual BOOL getRowGrand() const; - virtual void setRowGrand(BOOL bSet); + virtual BOOL getColumnGrand() const; + virtual void setColumnGrand(BOOL bSet); + virtual BOOL getRowGrand() const; + virtual void setRowGrand(BOOL bSet); - virtual BOOL getIgnoreEmptyRows() const; - virtual void setIgnoreEmptyRows(BOOL bSet); - virtual BOOL getRepeatIfEmpty() const; - virtual void setRepeatIfEmpty(BOOL bSet); + virtual BOOL getIgnoreEmptyRows() const; + virtual void setIgnoreEmptyRows(BOOL bSet); + virtual BOOL getRepeatIfEmpty() const; + virtual void setRepeatIfEmpty(BOOL bSet); - virtual void validate(); //! ??? - virtual void disposeData(); + virtual void validate(); //! ??? + virtual void disposeData(); }; class ScDPDimensions : public cppu::WeakImplHelper2< @@ -304,15 +304,15 @@ class ScDPDimensions : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDimCount; - ScDPDimension** ppDims; + ScDPSource* pSource; + long nDimCount; + ScDPDimension** ppDims; public: ScDPDimensions( ScDPSource* pSrc ); - virtual ~ScDPDimensions(); + virtual ~ScDPDimensions(); - void CountChanged(); + void CountChanged(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -337,8 +337,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPDimension* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPDimension* getByIndex(long nIndex) const; }; class ScDPDimension : public cppu::WeakImplHelper5< @@ -349,38 +349,38 @@ class ScDPDimension : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; // dimension index (== column ID) - ScDPHierarchies* pHierarchies; - long nUsedHier; - USHORT nFunction; // enum GeneralFunction - String aName; // if empty, take from source + ScDPSource* pSource; + long nDim; // dimension index (== column ID) + ScDPHierarchies* pHierarchies; + long nUsedHier; + USHORT nFunction; // enum GeneralFunction + String aName; // if empty, take from source ::std::auto_ptr mpLayoutName; ::std::auto_ptr mpSubtotalName; - long nSourceDim; // >=0 if dup'ed + long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" - BOOL bHasSelectedPage; - String aSelectedPage; - ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage + BOOL bHasSelectedPage; + String aSelectedPage; + ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage sal_Bool mbHasHiddenMember; public: ScDPDimension( ScDPSource* pSrc, long nD ); - virtual ~ScDPDimension(); + virtual ~ScDPDimension(); long GetDimension() const { return nDim; } // dimension index in source - long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed + long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed - ScDPDimension* CreateCloneObject(); - ScDPHierarchies* GetHierarchiesObject(); + ScDPDimension* CreateCloneObject(); + ScDPHierarchies* GetHierarchiesObject(); SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; const ::rtl::OUString* GetSubtotalName() const; // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XHierarchiesSupplier @@ -395,7 +395,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -407,25 +407,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -440,23 +440,23 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual USHORT getOrientation() const; - virtual void setOrientation(USHORT nNew); - virtual long getPosition() const; - virtual void setPosition(long nNew); - virtual BOOL getIsDataLayoutDimension() const; - virtual USHORT getFunction() const; - virtual void setFunction(USHORT nNew); // for data dimension - virtual long getUsedHierarchy() const; - virtual void setUsedHierarchy(long nNew); - virtual BOOL isDuplicated() const; + virtual USHORT getOrientation() const; + virtual void setOrientation(USHORT nNew); + virtual long getPosition() const; + virtual void setPosition(long nNew); + virtual BOOL getIsDataLayoutDimension() const; + virtual USHORT getFunction() const; + virtual void setFunction(USHORT nNew); // for data dimension + virtual long getUsedHierarchy() const; + virtual void setUsedHierarchy(long nNew); + virtual BOOL isDuplicated() const; BOOL HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const; -//UNUSED2009-05 BOOL IsValidPage( const ScDPItemData& rData ); +//UNUSED2009-05 BOOL IsValidPage( const ScDPItemData& rData ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance BOOL IsVisible( const ScDPItemData& rData ); @@ -468,14 +468,14 @@ class ScDPHierarchies : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHierCount; - ScDPHierarchy** ppHiers; + ScDPSource* pSource; + long nDim; + long nHierCount; + ScDPHierarchy** ppHiers; public: ScDPHierarchies( ScDPSource* pSrc, long nD ); - virtual ~ScDPHierarchies(); + virtual ~ScDPHierarchies(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -500,8 +500,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPHierarchy* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPHierarchy* getByIndex(long nIndex) const; }; class ScDPHierarchy : public cppu::WeakImplHelper3< @@ -510,20 +510,20 @@ class ScDPHierarchy : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - ScDPLevels* pLevels; + ScDPSource* pSource; + long nDim; + long nHier; + ScDPLevels* pLevels; public: ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ); - virtual ~ScDPHierarchy(); + virtual ~ScDPHierarchy(); - ScDPLevels* GetLevelsObject(); + ScDPLevels* GetLevelsObject(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XLevelsSupplier @@ -544,15 +544,15 @@ class ScDPLevels : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLevCount; - ScDPLevel** ppLevs; + ScDPSource* pSource; + long nDim; + long nHier; + long nLevCount; + ScDPLevel** ppLevs; public: ScDPLevels( ScDPSource* pSrc, long nD, long nH ); - virtual ~ScDPLevels(); + virtual ~ScDPLevels(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -577,8 +577,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPLevel* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPLevel* getByIndex(long nIndex) const; }; class ScDPLevel : public cppu::WeakImplHelper5< @@ -589,13 +589,13 @@ class ScDPLevel : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; - ScDPMembers* pMembers; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; + ScDPMembers* pMembers; com::sun::star::uno::Sequence aSubTotals; - BOOL bShowEmpty; + BOOL bShowEmpty; ::com::sun::star::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldLayoutInfo aLayoutInfo; // stored user settings @@ -607,13 +607,13 @@ private: public: ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ); - virtual ~ScDPLevel(); + virtual ~ScDPLevel(); - ScDPMembers* GetMembersObject(); + ScDPMembers* GetMembersObject(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XMembersSupplier @@ -628,7 +628,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -640,25 +640,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -674,10 +674,10 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence getSubTotals() const; - virtual void setSubTotals(const com::sun::star::uno::Sequence< + virtual void setSubTotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction>& rNew); - virtual BOOL getShowEmpty() const; - virtual void setShowEmpty(BOOL bSet); + virtual BOOL getShowEmpty() const; + virtual void setShowEmpty(BOOL bSet); const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } @@ -702,7 +702,7 @@ public: BOOL IsAddEmpty() const { return bEnableLayout && aLayoutInfo.AddEmptyLines; } - //! number format (for data fields and date fields) + //! number format (for data fields and date fields) }; // hash map from name to index in the member array, for fast name access @@ -713,17 +713,17 @@ class ScDPMembers : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; - long nMbrCount; - ScDPMember** ppMbrs; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; + long nMbrCount; + ScDPMember** ppMbrs; mutable ScDPMembersHashMap aHashMap; public: ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ); - virtual ~ScDPMembers(); + virtual ~ScDPMembers(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -748,10 +748,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPMember* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPMember* getByIndex(long nIndex) const; - long getMinMembers() const; + long getMinMembers() const; sal_Int32 GetIndexFromName( const ::rtl::OUString& rName ) const; // <0 if not found // Wang Xu Ming -- 2009-8-17 @@ -768,21 +768,21 @@ class ScDPMember : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance SCROW mnDataId; // End Comments -// String aCaption; // visible name (changeable by user) +// String aCaption; // visible name (changeable by user) ::std::auto_ptr mpLayoutName; sal_Int32 nPosition; // manual sorting - BOOL bVisible; - BOOL bShowDet; + BOOL bVisible; + BOOL bShowDet; public: // Wang Xu Ming -- 2009-8-17 @@ -790,13 +790,13 @@ public: ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex /*const String& rN, double fV, BOOL bHV */); // End Comments - virtual ~ScDPMember(); + virtual ~ScDPMember(); - BOOL IsNamedItem( const ScDPItemData& r ) const; - String GetNameStr() const; - void FillItemData( ScDPItemData& rData ) const; + BOOL IsNamedItem( const ScDPItemData& r ) const; + String GetNameStr() const; + void FillItemData( ScDPItemData& rData ) const; // Wang Xu Ming -- 2009-8-17 - // DataPilot Migration - Cache&&Performance + // DataPilot Migration - Cache&&Performance // const ScDPItemData& GetItemData() const{ return maData; } const ScDPItemData& GetItemData() const; inline SCROW GetItemDataId() const { return mnDataId; } @@ -809,14 +809,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -828,25 +828,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -861,10 +861,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual BOOL getIsVisible() const; - virtual void setIsVisible(BOOL bSet); - virtual BOOL getShowDetails() const; - virtual void setShowDetails(BOOL bSet); + virtual BOOL getIsVisible() const; + virtual void setIsVisible(BOOL bSet); + virtual BOOL getShowDetails() const; + virtual void setShowDetails(BOOL bSet); sal_Int32 getPosition() const; void setPosition(sal_Int32 nNew); diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index ee4f48ad9cf5..fefc32caf2ae 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -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 @@ -41,16 +41,16 @@ public: SvxDrawToolItem(USHORT nWhichP) : SfxEnumItem(nWhichP){} - virtual String GetValueText() const; + virtual String GetValueText() const; - virtual String GetValueText(USHORT nVal) const; - virtual USHORT GetValueCount() const + virtual String GetValueText(USHORT nVal) const; + virtual USHORT GetValueCount() const {return((USHORT)SVX_SNAP_DRAW_TEXT);} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; inline SvxDrawToolItem& operator=(const SvxDrawToolItem& rDrawTool) diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 9c39fc71e5af..a2c1da06a49b 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -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/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx index 09fd3368271e..d2bd540f55c2 100644 --- a/sc/inc/drdefuno.hxx +++ b/sc/inc/drdefuno.hxx @@ -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 @@ -36,16 +36,16 @@ class ScDocShell; class ScDrawDefaultsObj : public SvxUnoDrawPool, public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; public: ScDrawDefaultsObj(ScDocShell* pDocSh); - virtual ~ScDrawDefaultsObj() throw (); + virtual ~ScDrawDefaultsObj() throw (); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // from SvxUnoDrawPool - virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); + virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); }; #endif diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 7dd9903f82a1..0d76cfa3db7a 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -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 @@ -50,25 +50,25 @@ class ScAddress; class ScTabDeletedHint : public SfxHint { private: - SCTAB nTab; + SCTAB nTab; public: TYPEINFO(); ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX ); - virtual ~ScTabDeletedHint(); + virtual ~ScTabDeletedHint(); - SCTAB GetTab() { return nTab; } + SCTAB GetTab() { return nTab; } }; class ScTabSizeChangedHint : public SfxHint { private: - SCTAB nTab; + SCTAB nTab; public: TYPEINFO(); ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX ); - virtual ~ScTabSizeChangedHint(); + virtual ~ScTabSizeChangedHint(); - SCTAB GetTab() { return nTab; } + SCTAB GetTab() { return nTab; } }; // ----------------------------------------------------------------------- @@ -98,104 +98,104 @@ public: class SC_DLLPUBLIC ScDrawLayer : public FmFormModel { private: -//REMOVE SotStorageRef xPictureStorage; - String aName; - ScDocument* pDoc; - SdrUndoGroup* pUndoGroup; - BOOL bRecording; - BOOL bAdjustEnabled; - BOOL bHyphenatorSet; +//REMOVE SotStorageRef xPictureStorage; + String aName; + ScDocument* pDoc; + SdrUndoGroup* pUndoGroup; + BOOL bRecording; + BOOL bAdjustEnabled; + BOOL bHyphenatorSet; private: - void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, + void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, const Point& rTopLeft ); - void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, + void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos ); void RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos ); public: ScDrawLayer( ScDocument* pDocument, const String& rName ); - virtual ~ScDrawLayer(); + virtual ~ScDrawLayer(); virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual SdrModel* AllocModel() const; - virtual void SetChanged( sal_Bool bFlg = sal_True ); + virtual void SetChanged( sal_Bool bFlg = sal_True ); virtual Window* GetCurDocViewWin(); virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const; virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const; -//REMOVE void ReleasePictureStorage(); +//REMOVE void ReleasePictureStorage(); - BOOL HasObjects() const; + BOOL HasObjects() const; BOOL ScAddPage( SCTAB nTab ); - void ScRemovePage( SCTAB nTab ); - void ScRenamePage( SCTAB nTab, const String& rNewName ); - void ScMovePage( USHORT nOldPos, USHORT nNewPos ); + void ScRemovePage( SCTAB nTab ); + void ScRenamePage( SCTAB nTab, const String& rNewName ); + void ScMovePage( USHORT nOldPos, USHORT nNewPos ); // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt - void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); + void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); - ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() const { return pDoc; } - void UpdateBasic(); // DocShell-Basic in DrawPages setzen - void UseHyphenator(); + void UpdateBasic(); // DocShell-Basic in DrawPages setzen + void UseHyphenator(); - BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; + BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - // automatische Anpassungen + // automatische Anpassungen - void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } + void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } - void BeginCalcUndo(); - SdrUndoGroup* GetCalcUndo(); - BOOL IsRecording() const { return bRecording; } - void AddCalcUndo( SdrUndoAction* pUndo ); + void BeginCalcUndo(); + SdrUndoGroup* GetCalcUndo(); + BOOL IsRecording() const { return bRecording; } + void AddCalcUndo( SdrUndoAction* pUndo ); - void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, + void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true ); - void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); - void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); + void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); + void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); - BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ); + BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ); - void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, + void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 ); - void DeleteObjectsInSelection( const ScMarkData& rMark ); + void DeleteObjectsInSelection( const ScMarkData& rMark ); #if 0 - void DeleteObjects( SCTAB nTab ); + void DeleteObjects( SCTAB nTab ); #endif - void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange ); - void CopyFromClip( ScDrawLayer* pClipModel, + void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange ); + void CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const Rectangle& rSourceRange, const ScAddress& rDestPos, const Rectangle& rDestRange ); - void SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); + void SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); - // mirror or move between positive and negative positions for RTL - void MirrorRTL( SdrObject* pObj ); - static void MirrorRectRTL( Rectangle& rRect ); // for bounding rectangles etc. + // mirror or move between positive and negative positions for RTL + void MirrorRTL( SdrObject* pObj ); + static void MirrorRectRTL( Rectangle& rRect ); // for bounding rectangles etc. /** Returns the rectangle for the passed cell address in 1/100 mm. @param bMergedCell True = regards merged cells. False = use single column/row size. */ static Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell ); - // GetVisibleName: name for navigator etc: GetPersistName or GetName - // (ChartListenerCollection etc. must use GetPersistName directly) - static String GetVisibleName( SdrObject* pObj ); + // GetVisibleName: name for navigator etc: GetPersistName or GetName + // (ChartListenerCollection etc. must use GetPersistName directly) + static String GetVisibleName( SdrObject* pObj ); - SdrObject* GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const; + SdrObject* GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const; // if pnCounter != NULL, the search for a name starts with this index + 1, // and the index really used is returned. String GetNewGraphicName( long* pnCounter = NULL ) const; - void EnsureGraphicNames(); + void EnsureGraphicNames(); // Verankerung setzen und ermitteln - static void SetAnchor( SdrObject*, ScAnchorType ); - static ScAnchorType GetAnchor( const SdrObject* ); + static void SetAnchor( SdrObject*, ScAnchorType ); + static ScAnchorType GetAnchor( const SdrObject* ); // Positionen fuer Detektivlinien static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE ); @@ -220,9 +220,9 @@ public: static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE ); private: - static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel + static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel public: - static void SetGlobalDrawPersist(SfxObjectShell* pPersist); + static void SetGlobalDrawPersist(SfxObjectShell* pPersist); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); }; diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index ed4423d629a8..32756a41acb1 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -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 @@ -54,121 +54,121 @@ public: ScHeaderFooterChangedHint(USHORT nP); ~ScHeaderFooterChangedHint(); - USHORT GetPart() const { return nPart; } + USHORT GetPart() const { return nPart; } }; -// all ScSharedHeaderFooterEditSource objects for a single text share the same data +// all ScSharedHeaderFooterEditSource objects for a single text share the same data class ScSharedHeaderFooterEditSource : public SvxEditSource { private: - ScHeaderFooterTextData* pTextData; + ScHeaderFooterTextData* pTextData; protected: - ScHeaderFooterTextData* GetTextData() const { return pTextData; } // for ScHeaderFooterEditSource + ScHeaderFooterTextData* GetTextData() const { return pTextData; } // for ScHeaderFooterEditSource public: ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData ); - virtual ~ScSharedHeaderFooterEditSource(); + virtual ~ScSharedHeaderFooterEditSource(); - // GetEditEngine is needed because the forwarder doesn't have field functions - ScEditEngineDefaulter* GetEditEngine(); + // GetEditEngine is needed because the forwarder doesn't have field functions + ScEditEngineDefaulter* GetEditEngine(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual void UpdateData(); }; -// ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is used by field objects +// ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is used by field objects class ScHeaderFooterEditSource : public ScSharedHeaderFooterEditSource { public: ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, USHORT nP ); ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, USHORT nP ); - virtual ~ScHeaderFooterEditSource(); + virtual ~ScHeaderFooterEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const; }; -// Data (incl. EditEngine) for cell EditSource is now shared in ScCellTextData +// Data (incl. EditEngine) for cell EditSource is now shared in ScCellTextData class ScSharedCellEditSource : public SvxEditSource { private: - ScCellTextData* pCellTextData; + ScCellTextData* pCellTextData; protected: - ScCellTextData* GetCellTextData() const { return pCellTextData; } // for ScCellEditSource + ScCellTextData* GetCellTextData() const { return pCellTextData; } // for ScCellEditSource public: ScSharedCellEditSource( ScCellTextData* pData ); - virtual ~ScSharedCellEditSource(); + virtual ~ScSharedCellEditSource(); - // GetEditEngine is needed because the forwarder doesn't have field functions - ScEditEngineDefaulter* GetEditEngine(); + // GetEditEngine is needed because the forwarder doesn't have field functions + ScEditEngineDefaulter* GetEditEngine(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual void UpdateData(); - void SetDoUpdateData(sal_Bool bValue); - sal_Bool IsDirty() const; + void SetDoUpdateData(sal_Bool bValue); + sal_Bool IsDirty() const; }; -// ScCellEditSource with local copy of ScCellTextData is used by ScCellFieldsObj, ScCellFieldObj +// ScCellEditSource with local copy of ScCellTextData is used by ScCellFieldsObj, ScCellFieldObj class ScCellEditSource : public ScSharedCellEditSource { public: ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ); - virtual ~ScCellEditSource(); + virtual ~ScCellEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const; }; class ScAnnotationEditSource : public SvxEditSource, public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; + ScDocShell* pDocShell; + ScAddress aCellPos; ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; + SvxEditEngineForwarder* pForwarder; + BOOL bDataValid; SdrObject* GetCaptionObj(); public: ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScAnnotationEditSource(); + virtual ~ScAnnotationEditSource(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -// EditSource with a shared forwarder for all children of one text object +// EditSource with a shared forwarder for all children of one text object class ScSimpleEditSource : public SvxEditSource { private: - SvxTextForwarder* pForwarder; + SvxTextForwarder* pForwarder; public: ScSimpleEditSource( SvxTextForwarder* pForw ); - virtual ~ScSimpleEditSource(); + virtual ~ScSimpleEditSource(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); }; @@ -179,14 +179,14 @@ private: public: ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ); - virtual ~ScAccessibilityEditSource(); - - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual ~ScAccessibilityEditSource(); + + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual void UpdateData(); + virtual SfxBroadcaster& GetBroadcaster() const; }; #endif diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index aefa789d2587..974ceef2807d 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -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 @@ -45,16 +45,16 @@ class ScEditEngineDefaulter; class ScEditUtil { - ScDocument* pDoc; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - Point aScrPos; - OutputDevice* pDev; // MapMode muss eingestellt sein - double nPPTX; - double nPPTY; - Fraction aZoomX; - Fraction aZoomY; + ScDocument* pDoc; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + Point aScrPos; + OutputDevice* pDev; // MapMode muss eingestellt sein + double nPPTX; + double nPPTY; + Fraction aZoomX; + Fraction aZoomY; static const char __FAR_DATA pCalcDelimiters[]; @@ -76,24 +76,24 @@ public: aScrPos(rScrPosPixel),pDev(pDevice), nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {} - Rectangle GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop ); + Rectangle GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop ); }; class ScEditAttrTester { ScEditEngineDefaulter* pEngine; - SfxItemSet* pEditAttrs; - BOOL bNeedsObject; - BOOL bNeedsCellAttr; + SfxItemSet* pEditAttrs; + BOOL bNeedsObject; + BOOL bNeedsCellAttr; public: ScEditAttrTester( ScEditEngineDefaulter* pEng ); ~ScEditAttrTester(); - BOOL NeedsObject() const { return bNeedsObject; } - BOOL NeedsCellAttr() const { return bNeedsCellAttr; } - const SfxItemSet& GetAttribs() const { return *pEditAttrs; } + BOOL NeedsObject() const { return bNeedsObject; } + BOOL NeedsCellAttr() const { return bNeedsCellAttr; } + const SfxItemSet& GetAttribs() const { return *pEditAttrs; } }; @@ -101,15 +101,15 @@ public: class ScEnginePoolHelper { protected: - SfxItemPool* pEnginePool; - SfxItemSet* pDefaults; - BOOL bDeleteEnginePool; - BOOL bDeleteDefaults; + SfxItemPool* pEnginePool; + SfxItemSet* pDefaults; + BOOL bDeleteEnginePool; + BOOL bDeleteDefaults; ScEnginePoolHelper( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE ); ScEnginePoolHelper( const ScEnginePoolHelper& rOrg ); - virtual ~ScEnginePoolHelper(); + virtual ~ScEnginePoolHelper(); }; @@ -126,47 +126,47 @@ public: /// If rOrg.bDeleteEnginePool: pool gets cloned and will be /// deleted on destruction. Defaults are not set. ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ); - virtual ~ScEditEngineDefaulter(); + virtual ~ScEditEngineDefaulter(); /// Creates a copy of SfxItemSet if bRememberCopy set - void SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); + void SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Becomes the owner of the SfxItemSet if bTakeOwnership set - void SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); + void SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Set the item in the default ItemSet which is created /// if it doesn't exist yet. /// The default ItemSet is then applied to each paragraph. - void SetDefaultItem( const SfxPoolItem& rItem ); + void SetDefaultItem( const SfxPoolItem& rItem ); /// Returns the stored defaults, used to find non-default character attributes const SfxItemSet& GetDefaults(); /// Overwritten method to be able to apply defaults already set - void SetText( const EditTextObject& rTextObject ); + void SetText( const EditTextObject& rTextObject ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const EditTextObject& rTextObject, + void SetTextNewDefaults( const EditTextObject& rTextObject, const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const EditTextObject& rTextObject, + void SetTextNewDefaults( const EditTextObject& rTextObject, SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Overwritten method to be able to apply defaults already set - void SetText( const String& rText ); + void SetText( const String& rText ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const String& rText, const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const String& rText, SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Paragraph attributes that are not defaults are copied to /// character attributes and all paragraph attributes reset - void RemoveParaAttribs(); + void RemoveParaAttribs(); /// Re-apply existing defaults if set, same as in SetText, /// but without EnableUndo/SetUpdateMode. - void RepeatDefaults(); + void RepeatDefaults(); }; @@ -174,9 +174,9 @@ public: class SC_DLLPUBLIC ScTabEditEngine : public ScEditEngineDefaulter { private: - void Init(const ScPatternAttr& rPattern); + void Init(const ScPatternAttr& rPattern); public: - ScTabEditEngine( ScDocument* pDoc ); // Default + ScTabEditEngine( ScDocument* pDoc ); // Default // pEnginePool = ScDocument.GetEnginePool() // pTextObjectPool = ScDocument.GetEditPool() ScTabEditEngine( const ScPatternAttr& rPattern, @@ -187,15 +187,15 @@ public: struct ScHeaderFieldData { - String aTitle; // Titel oder Dateiname wenn kein Titel - String aLongDocName; // Pfad und Dateiname - String aShortDocName; // nur Dateiname - String aTabName; - Date aDate; - Time aTime; - long nPageNo; - long nTotalPages; - SvxNumType eNumType; + String aTitle; // Titel oder Dateiname wenn kein Titel + String aLongDocName; // Pfad und Dateiname + String aShortDocName; // nur Dateiname + String aTabName; + Date aDate; + Time aTime; + long nPageNo; + long nTotalPages; + SvxNumType eNumType; ScHeaderFieldData(); }; @@ -205,7 +205,7 @@ struct ScHeaderFieldData class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter { private: - BOOL bExecuteURL; + BOOL bExecuteURL; public: // pEnginePool = ScDocument.GetEnginePool() @@ -214,10 +214,10 @@ public: SfxItemPool* pTextObjectPool = NULL, BOOL bDeleteEnginePool = FALSE ); - void SetExecuteURL(BOOL bSet) { bExecuteURL = bSet; } + void SetExecuteURL(BOOL bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, USHORT, USHORT ); - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT, USHORT ); + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); }; @@ -225,22 +225,22 @@ public: class SC_DLLPUBLIC ScHeaderEditEngine : public ScEditEngineDefaulter { private: - ScHeaderFieldData aData; + ScHeaderFieldData aData; public: ScHeaderEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE ); virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); - void SetTitle(const String& rNew) { aData.aTitle = rNew; } - void SetLongDocName(const String& rNew) { aData.aLongDocName = rNew; } - void SetShortDocName(const String& rNew) { aData.aShortDocName = rNew; } - void SetTabName(const String& rNew) { aData.aTabName = rNew; } - void SetDate(const Date& rNew) { aData.aDate = rNew; } - void SetTime(const Time& rNew) { aData.aTime = rNew; } - void SetPageNo(long nNew) { aData.nPageNo = nNew; } - void SetTotalPages(long nNew) { aData.nTotalPages = nNew; } - void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } - void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } + void SetTitle(const String& rNew) { aData.aTitle = rNew; } + void SetLongDocName(const String& rNew) { aData.aLongDocName = rNew; } + void SetShortDocName(const String& rNew) { aData.aShortDocName = rNew; } + void SetTabName(const String& rNew) { aData.aTabName = rNew; } + void SetDate(const Date& rNew) { aData.aDate = rNew; } + void SetTime(const Time& rNew) { aData.aTime = rNew; } + void SetPageNo(long nNew) { aData.nPageNo = nNew; } + void SetTotalPages(long nNew) { aData.nTotalPages = nNew; } + void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } + void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } }; // for Note text objects. @@ -256,7 +256,7 @@ public: }; -// SvxFieldData-Ableitungen sind nach Svx verschoben +// SvxFieldData-Ableitungen sind nach Svx verschoben #endif diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index f3ae72f0f1bf..8f25ae4874e8 100755 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -1,7 +1,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/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 818920885493..49627f227ef5 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -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 @@ -129,14 +129,14 @@ public: class Table; friend class ScExternalRefCache::Table; - /** - * Represents a single cached table in an external document. It only - * stores non-empty cells; empty cells should never be stored in the data - * cache. Instead, cached ranges should be used to determine whether or - * not a cell is empty or needs fetching from the source document. If a - * cell's value is not stored but its address is within the cached ranges, - * that cell is already queried in the source document and we know it's - * empty. + /** + * Represents a single cached table in an external document. It only + * stores non-empty cells; empty cells should never be stored in the data + * cache. Instead, cached ranges should be used to determine whether or + * not a cell is empty or needs fetching from the source document. If a + * cell's value is not stored but its address is within the cached ranges, + * that cell is already queried in the source document and we know it's + * empty. */ class Table { @@ -152,10 +152,10 @@ public: Table(); ~Table(); - /** + /** * Add cell value to the cache. * - * @param bSetCacheRange if true, mark this cell 'cached'. This is + * @param bSetCacheRange if true, mark this cell 'cached'. This is * false _only when_ adding a range of cell * values, for performance reasons. */ @@ -184,12 +184,12 @@ public: void setCachedCell(SCCOL nCol, SCROW nRow); void setCachedCellRange(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - /** + /** * Call this to mark the entire table "cached". This will prevent all - * future attempts to access the source document even when non-cached - * cells are queried. In such case, non-cached cells are treated as - * empty cells. Useful when loading a document with own external data - * cache. + * future attempts to access the source document even when non-cached + * cells are queried. In such case, non-cached cells are treated as + * empty cells. Useful when loading a document with own external data + * cache. */ SC_DLLPUBLIC void setWholeTableCached(); private: @@ -390,10 +390,10 @@ public: }; }; - /** - * Use this guard when performing something from the API that might query - * values from external references. Interpreting formula strings is one - * such example. + /** + * Use this guard when performing something from the API that might query + * values from external references. Interpreting formula strings is one + * such example. */ class ApiGuard { @@ -645,10 +645,10 @@ public: */ void resetSrcFileData(const String& rBaseFileUrl); - /** - * Stop tracking a specific formula cell. - * - * @param pCell pointer to cell that formerly contained external + /** + * Stop tracking a specific formula cell. + * + * @param pCell pointer to cell that formerly contained external * reference. */ void removeRefCell(ScFormulaCell* pCell); @@ -744,8 +744,8 @@ private: /** Status whether in reference marking state. See isInReferenceMarking(). */ bool mbInReferenceMarking:1; - /** - * Controls whether or not to allow user interaction. We don't want any + /** + * Controls whether or not to allow user interaction. We don't want any * user interaction when calling from the API. */ bool mbUserInteractionEnabled:1; diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 584d62451cc6..6f57383ed057 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -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 @@ -30,7 +30,7 @@ #include "address.hxx" #include "mutexhlp.hxx" - + #include #include #include @@ -66,21 +66,21 @@ class ScCellFieldsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxEditSource* pEditSource; - /// List of refresh listeners. + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxEditSource* pEditSource; + /// List of refresh listeners. cppu::OInterfaceContainerHelper* mpRefreshListeners; /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScCellFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScCellFieldObj* GetObjectByIndex_Impl(INT32 Index) const; public: ScCellFieldsObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScCellFieldsObj(); + virtual ~ScCellFieldsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -99,17 +99,17 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh( ) + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< @@ -135,29 +135,29 @@ class ScCellFieldObj : public ScMutexHelper, public SfxListener { private: - const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxEditSource* pEditSource; - ESelection aSelection; + const SfxItemPropertySet* pPropSet; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxEditSource* pEditSource; + ESelection aSelection; - String aUrl; // Inhalt, wenn noch nicht eingefuegt (nur dann!) - String aRepresentation; - String aTarget; + String aUrl; // Inhalt, wenn noch nicht eingefuegt (nur dann!) + String aRepresentation; + String aTarget; ScCellFieldObj(); // disabled public: ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel); - virtual ~ScCellFieldObj(); + virtual ~ScCellFieldObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: - void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } - SvxFieldItem CreateFieldItem(); - void InitDoc( ScDocShell* pDocSh, const ScAddress& rPos, + void DeleteField(); + BOOL IsInserted() const { return pEditSource != NULL; } + SvxFieldItem CreateFieldItem(); + void InitDoc( ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel ); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( @@ -166,15 +166,15 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTextField virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -182,11 +182,11 @@ public: getAnchor() throw(::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -194,7 +194,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -206,25 +206,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -265,22 +265,22 @@ class ScHeaderFieldsObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; - SvxEditSource* pEditSource; + ScHeaderFooterContentObj* pContentObj; + USHORT nPart; + UINT16 nType; + SvxEditSource* pEditSource; - /// List of refresh listeners. + /// List of refresh listeners. cppu::OInterfaceContainerHelper* mpRefreshListeners; /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScHeaderFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScHeaderFieldObj* GetObjectByIndex_Impl(INT32 Index) const; public: ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT); - virtual ~ScHeaderFieldsObj(); + virtual ~ScHeaderFieldsObj(); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -299,17 +299,17 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh( ) + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< @@ -335,24 +335,24 @@ class ScHeaderFieldObj : public ScMutexHelper, { private: const SfxItemPropertySet* pPropSet; - ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; - SvxEditSource* pEditSource; - ESelection aSelection; - sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted - - ScHeaderFieldObj(); // disabled + ScHeaderFooterContentObj* pContentObj; + USHORT nPart; + UINT16 nType; + SvxEditSource* pEditSource; + ESelection aSelection; + sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted + + ScHeaderFieldObj(); // disabled public: ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT, const ESelection& rSel); - virtual ~ScHeaderFieldObj(); + virtual ~ScHeaderFieldObj(); // per getImplementation gerufen: - void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } - SvxFieldItem CreateFieldItem(); - void InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, + void DeleteField(); + BOOL IsInserted() const { return pEditSource != NULL; } + SvxFieldItem CreateFieldItem(); + void InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, const ESelection& rSel ); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( @@ -361,15 +361,15 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTextField virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -377,11 +377,11 @@ public: getAnchor() throw(::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -389,7 +389,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -401,25 +401,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx index 8dead5b4fb05..b5eb3f5633e0 100644 --- a/sc/inc/fillinfo.hxx +++ b/sc/inc/fillinfo.hxx @@ -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/sc/inc/filter.hxx b/sc/inc/filter.hxx index ae0fd92f6858..c3021adf3181 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -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 @@ -41,27 +41,27 @@ class ScDocument; class ScRange; class SvNumberFormatter; -// Return-Werte Im-/Exportfilter (ULONG) +// Return-Werte Im-/Exportfilter (ULONG) typedef ULONG FltError; //enum FltError { -#define eERR_OK ERRCODE_NONE // kein Fehler, alles OK -#define eERR_OPEN SCERR_IMPORT_OPEN // ... -#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unbekannter Fehler, auch historische Bedeutung -#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // nicht mehr genuegend Speicher zur Verfuegung -#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unbekanntes WK?-Format (Lotus 1-2-3) -#define eERR_FORMAT SCERR_IMPORT_FORMAT // Formatfehler beim Lesen (kein Formel-Fehler!) -#define eERR_NI SCERR_IMPORT_NI // Nicht implementierter Filter -#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unbekanntes BIFF-Format (Excel) -#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // nicht implementiertes BIFF-Format -#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // File Passwordgeschuetzt -#define eERR_INTERN SCERR_IMPORT_INTERNAL // interner Fehler -#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// ueberlauf der Zellkoordinaten: - // Tabelle abgschnitten auf erlaubtem Bereich +#define eERR_OK ERRCODE_NONE // kein Fehler, alles OK +#define eERR_OPEN SCERR_IMPORT_OPEN // ... +#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unbekannter Fehler, auch historische Bedeutung +#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // nicht mehr genuegend Speicher zur Verfuegung +#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unbekanntes WK?-Format (Lotus 1-2-3) +#define eERR_FORMAT SCERR_IMPORT_FORMAT // Formatfehler beim Lesen (kein Formel-Fehler!) +#define eERR_NI SCERR_IMPORT_NI // Nicht implementierter Filter +#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unbekanntes BIFF-Format (Excel) +#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // nicht implementiertes BIFF-Format +#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // File Passwordgeschuetzt +#define eERR_INTERN SCERR_IMPORT_INTERNAL // interner Fehler +#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// ueberlauf der Zellkoordinaten: + // Tabelle abgschnitten auf erlaubtem Bereich // mehr Fehlercodes siehe scerrors.hxx -// }; +// }; // fuer Import @@ -73,12 +73,12 @@ enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpB // Optionen fuer DIF-Im-/Export (Kombination ueber '|') -#define SC_DIFOPT_PLAIN 0x00000000 -#define SC_DIFOPT_DATE 0x00000001 -#define SC_DIFOPT_TIME 0x00000002 -#define SC_DIFOPT_CURRENCY 0x00000004 +#define SC_DIFOPT_PLAIN 0x00000000 +#define SC_DIFOPT_DATE 0x00000001 +#define SC_DIFOPT_TIME 0x00000002 +#define SC_DIFOPT_CURRENCY 0x00000004 -#define SC_DIFOPT_EXCEL (SC_DIFOPT_DATE|SC_DIFOPT_TIME|SC_DIFOPT_CURRENCY) +#define SC_DIFOPT_EXCEL (SC_DIFOPT_DATE|SC_DIFOPT_TIME|SC_DIFOPT_CURRENCY) // These are implemented inside the scfilt library and lazy loaded @@ -90,8 +90,8 @@ class ScEEAbsImport { virtual ~ScEEAbsImport() {} virtual ULONG Read( SvStream& rStream, const String& rBaseURL ) = 0; virtual ScRange GetRange() = 0; - virtual void WriteToDocument( - BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, + virtual void WriteToDocument( + BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; }; @@ -101,15 +101,15 @@ class ScFormatFilterPlugin { virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0; virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) = 0; virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) = 0; - // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet - // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) - // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) + // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet + // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) + // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0; - virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, + virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; // various import helpers diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 0efdfeeb5a30..e15ffb412e58 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -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 @@ -38,23 +38,23 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { - BOOL bWK3Flag; - double fExcelColScale; - double fExcelRowScale; + BOOL bWK3Flag; + double fExcelColScale; + double fExcelRowScale; com::sun::star::uno::Sequence GetPropertyNames(); public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Commit(); - BOOL GetWK3Flag() const { return bWK3Flag; } - double GetExcelColScale() const { return fExcelColScale; } - double GetExcelRowScale() const { return fExcelRowScale; } + BOOL GetWK3Flag() const { return bWK3Flag; } + double GetExcelColScale() const { return fExcelColScale; } + double GetExcelRowScale() const { return fExcelRowScale; } - // values are never modified by office + // values are never modified by office }; diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index 2bddb7fdd02c..b4621b0ab303 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -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 @@ -55,24 +55,24 @@ class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< ::com::sun::star::lang::XServiceInfo > { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aFilterOptions; + ::rtl::OUString aFileName; + ::rtl::OUString aFilterName; + ::rtl::OUString aFilterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream; - sal_Bool bExport; + sal_Bool bExport; public: ScFilterOptionsObj(); - virtual ~ScFilterOptionsObj(); + virtual ~ScFilterOptionsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -81,18 +81,18 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index eebd808c30a4..df5ef5b5e7a7 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -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 @@ -82,28 +82,28 @@ class ScTableConditionalFormat : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - List aEntries; + List aEntries; - ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; + ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; void AddEntry_Impl(const ScCondFormatEntryItem& aEntry); ScTableConditionalFormat(); // disable public: ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableConditionalFormat(); + virtual ~ScTableConditionalFormat(); void FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar) const; - void DataChanged(); + void DataChanged(); // XSheetConditionalEntries - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aConditionalEntry ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -157,27 +157,27 @@ class ScTableConditionalEntry : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScTableConditionalFormat* pParent; + ScTableConditionalFormat* pParent; ScCondFormatEntryItem aData; ScTableConditionalEntry(); // disabled public: ScTableConditionalEntry(ScTableConditionalFormat* pPar, const ScCondFormatEntryItem& aItem); - virtual ~ScTableConditionalEntry(); + virtual ~ScTableConditionalEntry(); void GetData(ScCondFormatEntryItem& rData) const; // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) + virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -185,8 +185,8 @@ public: throw(::com::sun::star::uno::RuntimeException); // XSheetConditionalEntry - virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) + virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -208,51 +208,51 @@ class ScTableValidationObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; - USHORT nMode; // enum ScConditionMode - String aExpr1; - String aExpr2; + SfxItemPropertySet aPropSet; + USHORT nMode; // enum ScConditionMode + String aExpr1; + String aExpr2; String maExprNmsp1; String maExprNmsp2; formula::FormulaGrammar::Grammar meGrammar1; // grammar used with aExpr1 and aExpr2 formula::FormulaGrammar::Grammar meGrammar2; // grammar used with aExpr1 and aExpr2 ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1; ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; - ScAddress aSrcPos; + ScAddress aSrcPos; String aPosString; // formula position as text - USHORT nValMode; // enum ScValidationMode - BOOL bIgnoreBlank; + USHORT nValMode; // enum ScValidationMode + BOOL bIgnoreBlank; sal_Int16 nShowList; - BOOL bShowInput; - String aInputTitle; - String aInputMessage; - BOOL bShowError; - USHORT nErrorStyle; // enum ScValidErrorStyle - String aErrorTitle; - String aErrorMessage; + BOOL bShowInput; + String aInputTitle; + String aInputMessage; + BOOL bShowError; + USHORT nErrorStyle; // enum ScValidErrorStyle + String aErrorTitle; + String aErrorMessage; - void ClearData_Impl(); + void ClearData_Impl(); ScTableValidationObj(); // disabled public: ScTableValidationObj(ScDocument* pDoc, ULONG nKey, const formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableValidationObj(); + virtual ~ScTableValidationObj(); - ScValidationData* CreateValidationData( ScDocument* pDoc, + ScValidationData* CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const; - void DataChanged(); + void DataChanged(); // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) + virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -272,7 +272,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -284,25 +284,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx index 05e23cf96506..c191ca187bce 100644 --- a/sc/inc/forbiuno.hxx +++ b/sc/inc/forbiuno.hxx @@ -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 @@ -35,20 +35,20 @@ class ScDocShell; //------------------------------------------------------------------------ -// object to set forbidden charaters to document +// object to set forbidden charaters to document class ScForbiddenCharsObj : public SvxUnoForbiddenCharsTable, public SfxListener { - ScDocShell* pDocShell; + ScDocShell* pDocShell; protected: - virtual void onChange(); + virtual void onChange(); public: ScForbiddenCharsObj( ScDocShell* pDocSh ); - virtual ~ScForbiddenCharsObj(); + virtual ~ScForbiddenCharsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; #endif diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index c65f7f9428ce..72ef006283b6 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -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/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index bd99cca8f5d9..59a44a6bb0c6 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -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 @@ -159,7 +159,7 @@ public: details instead. */ inline bool IsValue() const; - /** Determines whether or not the result is a string containing more than + /** Determines whether or not the result is a string containing more than one paragraph */ inline bool IsMultiline() const; @@ -319,7 +319,7 @@ inline void ScFormulaResult::SetToken( const formula::FormulaToken* p ) dynamic_cast(p) : NULL); if (pMatResult) { - const ScMatrixFormulaCellToken* pNewMatFormula = + const ScMatrixFormulaCellToken* pNewMatFormula = dynamic_cast(pMatResult); if (pNewMatFormula) { diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index a8f495440554..d2fea379e6f8 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -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 @@ -73,7 +73,7 @@ public: ParameterFlags() : bOptional(false), bSuppress(false) {} }; - + ScFuncDesc(); virtual ~ScFuncDesc(); @@ -83,8 +83,8 @@ public: String GetParamList () const; /** Returns the full function signature: "FUNCTIONNAME( parameter list )". */ String GetSignature () const; - - + + /** Returns the number of non-suppressed arguments. In case there are variable arguments the number of fixed non-suppressed arguments plus @@ -169,7 +169,7 @@ public: virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; - virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; + virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; private: ScFunctionList* pFuncList; List* aCatLists[MAX_FUNCCAT]; diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 4413782a0e2f..b140d695e61c 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -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 @@ -47,19 +47,19 @@ class ScDocOptions; class ScTempDocCache { private: - ScDocument* pDoc; - BOOL bInUse; + ScDocument* pDoc; + BOOL bInUse; public: ScTempDocCache(); ~ScTempDocCache(); - ScDocument* GetDocument() const { return pDoc; } - BOOL IsInUse() const { return bInUse; } - void SetInUse( BOOL bSet ) { bInUse = bSet; } + ScDocument* GetDocument() const { return pDoc; } + BOOL IsInUse() const { return bInUse; } + void SetInUse( BOOL bSet ) { bInUse = bSet; } - void SetDocument( ScDocument* pNew ); - void Clear(); + void SetDocument( ScDocument* pNew ); + void Clear(); }; class ScFunctionAccess : public cppu::WeakImplHelper3< @@ -69,20 +69,20 @@ class ScFunctionAccess : public cppu::WeakImplHelper3< public SfxListener { private: - ScTempDocCache aDocCache; - ScDocOptions* pOptions; + ScTempDocCache aDocCache; + ScDocOptions* pOptions; SfxItemPropertyMap aPropertyMap; bool mbArray; bool mbValid; public: ScFunctionAccess(); - virtual ~ScFunctionAccess(); + virtual ~ScFunctionAccess(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XFunctionAccess virtual ::com::sun::star::uno::Any SAL_CALL callFunction( @@ -97,7 +97,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -109,25 +109,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 8178eb4a01d2..e456fed7de22 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -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 @@ -52,8 +52,8 @@ extern "C" { void DumpCAP(); }; -#define S_CAP StartCAP(); -#define E_CAP StopCAP(); DumpCAP(); +#define S_CAP StartCAP(); +#define E_CAP StopCAP(); DumpCAP(); #endif @@ -85,19 +85,19 @@ extern "C" { //------------------------------------------------------------------------ -// die 1000 Namen des Calc... -// Clipboard-Namen sind jetzt in so3/soapp.hxx -// STRING_SCAPP war "scalc3", "scalc4", jetzt nur noch "scalc" +// die 1000 Namen des Calc... +// Clipboard-Namen sind jetzt in so3/soapp.hxx +// STRING_SCAPP war "scalc3", "scalc4", jetzt nur noch "scalc" -#define STRING_SCAPP "scalc" -#define STRING_SCSTREAM "StarCalcDocument" +#define STRING_SCAPP "scalc" +#define STRING_SCSTREAM "StarCalcDocument" -#define STRING_STANDARD "Standard" +#define STRING_STANDARD "Standard" // characters ----------------------------------------------------------------- -// '\r' geht auf'm Mac nicht... -#define CHAR_CR char(13) +// '\r' geht auf'm Mac nicht... +#define CHAR_CR char(13) const sal_Unicode CHAR_NBSP = 0x00A0; const sal_Unicode CHAR_SHY = 0x00AD; @@ -109,11 +109,11 @@ const sal_Unicode CHAR_ZWNBSP = 0x2060; // ---------------------------------------------------------------------------- -#define MINDOUBLE 1.7e-307 -#define MAXDOUBLE 1.7e307 +#define MINDOUBLE 1.7e-307 +#define MAXDOUBLE 1.7e307 -#define MINZOOM 20 -#define MAXZOOM 400 +#define MINZOOM 20 +#define MAXZOOM 400 #ifdef SC_ROWLIMIT_TYPECONVERSION_NOCONVPASS const size_t MAXSUBTOTAL = 3; @@ -142,60 +142,60 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; #define PIXEL_PER_INCH 96.0 #define CM_PER_INCH 2.54 -#define POINTS_PER_INCH 72.27 -#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) -#define INCHT_PER_CM (1.0 / CM_PER_INCH) -#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH) -#define TWIPS_PER_POINT 20.0 -#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) -#define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH) -#define CM_PER_TWIPS (CM_PER_INCH / TWIPS_PER_INCH) -#define TWIPS_PER_PIXEL (TWIPS_PER_INCH / PIXEL_PER_INCH) -#define TWIPS_PER_CHAR (TWIPS_PER_INCH / 13.6) -#define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH) -#define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0) - -#define STD_COL_WIDTH 1285 -#define STD_EXTRA_WIDTH 113 // 2mm Extra fuer optimale Breite +#define POINTS_PER_INCH 72.27 +#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) +#define INCHT_PER_CM (1.0 / CM_PER_INCH) +#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH) +#define TWIPS_PER_POINT 20.0 +#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) +#define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH) +#define CM_PER_TWIPS (CM_PER_INCH / TWIPS_PER_INCH) +#define TWIPS_PER_PIXEL (TWIPS_PER_INCH / PIXEL_PER_INCH) +#define TWIPS_PER_CHAR (TWIPS_PER_INCH / 13.6) +#define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH) +#define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0) + +#define STD_COL_WIDTH 1285 +#define STD_EXTRA_WIDTH 113 // 2mm Extra fuer optimale Breite // Standard Zeilenhoehe: Text + Rand - STD_ROWHEIGHT_DIFF -#define MAX_EXTRA_WIDTH 23811 // 42cm in TWIPS -#define MAX_EXTRA_HEIGHT 23811 -#define MAX_COL_WIDTH 56693 // 1m in TWIPS -#define MAX_COL_HEIGHT 56693 +#define MAX_EXTRA_WIDTH 23811 // 42cm in TWIPS +#define MAX_EXTRA_HEIGHT 23811 +#define MAX_COL_WIDTH 56693 // 1m in TWIPS +#define MAX_COL_HEIGHT 56693 -#define STD_ROWHEIGHT_DIFF 23 -#define STD_FONT_HEIGHT 200 // entspricht 10 Punkt +#define STD_ROWHEIGHT_DIFF 23 +#define STD_FONT_HEIGHT 200 // entspricht 10 Punkt -//! statt STD_ROW_HEIGHT ScGlobal::nStdRowHeight benutzen ! +//! statt STD_ROW_HEIGHT ScGlobal::nStdRowHeight benutzen ! -#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) // 256 Twips, 0.45 cm +#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) // 256 Twips, 0.45 cm // Standardgroesse als Ole-Server (Zellen) -#define OLE_STD_CELLS_X 4 -#define OLE_STD_CELLS_Y 5 +#define OLE_STD_CELLS_X 4 +#define OLE_STD_CELLS_Y 5 -#define SC_SIZE_OPTIMUM 0xFFFF +#define SC_SIZE_OPTIMUM 0xFFFF // Update-Flags -#define UF_SCROLL_LEFT 1 -#define UF_SCROLL_RIGHT 2 -#define UF_SCROLL_UP 4 -#define UF_SCROLL_DOWN 8 -#define UF_ROW 16 -#define UF_VIEW 32 +#define UF_SCROLL_LEFT 1 +#define UF_SCROLL_RIGHT 2 +#define UF_SCROLL_UP 4 +#define UF_SCROLL_DOWN 8 +#define UF_ROW 16 +#define UF_VIEW 32 // Repaint-Flags (fuer Messages) -#define PAINT_GRID 1 -#define PAINT_TOP 2 -#define PAINT_LEFT 4 -#define PAINT_EXTRAS 8 -#define PAINT_INVERT 16 -#define PAINT_MARKS 32 -#define PAINT_OBJECTS 64 -#define PAINT_SIZE 128 -#define PAINT_ALL ( PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_OBJECTS | PAINT_SIZE ) +#define PAINT_GRID 1 +#define PAINT_TOP 2 +#define PAINT_LEFT 4 +#define PAINT_EXTRAS 8 +#define PAINT_INVERT 16 +#define PAINT_MARKS 32 +#define PAINT_OBJECTS 64 +#define PAINT_SIZE 128 +#define PAINT_ALL ( PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_OBJECTS | PAINT_SIZE ) // Flags fuer Spalten / Zeilen @@ -234,64 +234,64 @@ const USHORT IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): /// Copy flags for auto/series fill functions: do not touch notes and drawing objects. const USHORT IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); -#define PASTE_NOFUNC 0 -#define PASTE_ADD 1 -#define PASTE_SUB 2 -#define PASTE_MUL 3 -#define PASTE_DIV 4 +#define PASTE_NOFUNC 0 +#define PASTE_ADD 1 +#define PASTE_SUB 2 +#define PASTE_MUL 3 +#define PASTE_DIV 4 -#define PASTE_NONEMPTY 5 +#define PASTE_NONEMPTY 5 // Bits fuer HasAttr -#define HASATTR_LINES 1 -#define HASATTR_MERGED 2 -#define HASATTR_OVERLAPPED 4 -#define HASATTR_PROTECTED 8 -#define HASATTR_SHADOW 16 -#define HASATTR_NEEDHEIGHT 32 -#define HASATTR_SHADOW_RIGHT 64 -#define HASATTR_SHADOW_DOWN 128 -#define HASATTR_AUTOFILTER 256 -#define HASATTR_CONDITIONAL 512 -#define HASATTR_ROTATE 1024 -#define HASATTR_NOTOVERLAPPED 2048 -#define HASATTR_RTL 4096 +#define HASATTR_LINES 1 +#define HASATTR_MERGED 2 +#define HASATTR_OVERLAPPED 4 +#define HASATTR_PROTECTED 8 +#define HASATTR_SHADOW 16 +#define HASATTR_NEEDHEIGHT 32 +#define HASATTR_SHADOW_RIGHT 64 +#define HASATTR_SHADOW_DOWN 128 +#define HASATTR_AUTOFILTER 256 +#define HASATTR_CONDITIONAL 512 +#define HASATTR_ROTATE 1024 +#define HASATTR_NOTOVERLAPPED 2048 +#define HASATTR_RTL 4096 #define HASATTR_RIGHTORCENTER 8192 // right or centered logical alignment -#define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) +#define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) #define EMPTY_STRING ScGlobal::GetEmptyString() - // Layer-ID's fuer Drawing -#define SC_LAYER_FRONT 0 -#define SC_LAYER_BACK 1 -#define SC_LAYER_INTERN 2 -#define SC_LAYER_CONTROLS 3 + // Layer-ID's fuer Drawing +#define SC_LAYER_FRONT 0 +#define SC_LAYER_BACK 1 +#define SC_LAYER_INTERN 2 +#define SC_LAYER_CONTROLS 3 #define SC_LAYER_HIDDEN 4 - // Tabellen linken -#define SC_LINK_NONE 0 -#define SC_LINK_NORMAL 1 -#define SC_LINK_VALUE 2 + // Tabellen linken +#define SC_LINK_NONE 0 +#define SC_LINK_NORMAL 1 +#define SC_LINK_VALUE 2 - // Eingabe -#define SC_ENTER_NORMAL 0 -#define SC_ENTER_BLOCK 1 -#define SC_ENTER_MATRIX 2 + // Eingabe +#define SC_ENTER_NORMAL 0 +#define SC_ENTER_BLOCK 1 +#define SC_ENTER_MATRIX 2 - // Step = 10pt, max. Einzug = 100 Schritte -#define SC_INDENT_STEP 200 -#define SC_MAX_INDENT 20000 + // Step = 10pt, max. Einzug = 100 Schritte +#define SC_INDENT_STEP 200 +#define SC_MAX_INDENT 20000 - // Szenario-Flags -#define SC_SCENARIO_COPYALL 1 -#define SC_SCENARIO_SHOWFRAME 2 -#define SC_SCENARIO_PRINTFRAME 4 -#define SC_SCENARIO_TWOWAY 8 -#define SC_SCENARIO_ATTRIB 16 -#define SC_SCENARIO_VALUE 32 -#define SC_SCENARIO_PROTECT 64 + // Szenario-Flags +#define SC_SCENARIO_COPYALL 1 +#define SC_SCENARIO_SHOWFRAME 2 +#define SC_SCENARIO_PRINTFRAME 4 +#define SC_SCENARIO_TWOWAY 8 +#define SC_SCENARIO_ATTRIB 16 +#define SC_SCENARIO_VALUE 32 +#define SC_SCENARIO_PROTECT 64 #ifndef DELETEZ @@ -301,10 +301,10 @@ const USHORT IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); // Ist Bit in Set gesetzt? #define IS_SET(bit,set)(((set)&(bit))==(bit)) -#define SEL_ALL -1 // Eingabezeile: alles Selektieren -#define RES_CANCEL 0 // Resultate der Funk.AutoPilot-Seiten -#define RES_BACKWARD 1 -#define RES_END 2 +#define SEL_ALL -1 // Eingabezeile: alles Selektieren +#define RES_CANCEL 0 // Resultate der Funk.AutoPilot-Seiten +#define RES_BACKWARD 1 +#define RES_END 2 enum CellType { @@ -314,7 +314,7 @@ enum CellType CELLTYPE_FORMULA, CELLTYPE_NOTE, CELLTYPE_EDIT, - CELLTYPE_SYMBOLS // fuer Laden/Speichern + CELLTYPE_SYMBOLS // fuer Laden/Speichern #if DBG_UTIL ,CELLTYPE_DESTROYED #endif @@ -381,40 +381,40 @@ enum ScDirection enum ScSizeMode { - SC_SIZE_DIRECT, // set size or hide if value is 0 - SC_SIZE_OPTIMAL, // set optimal size for everything - SC_SIZE_SHOW, // show with original size - SC_SIZE_VISOPT, // set optimal size only if visible - SC_SIZE_ORIGINAL // only set size, don't change visible flag + SC_SIZE_DIRECT, // set size or hide if value is 0 + SC_SIZE_OPTIMAL, // set optimal size for everything + SC_SIZE_SHOW, // show with original size + SC_SIZE_VISOPT, // set optimal size only if visible + SC_SIZE_ORIGINAL // only set size, don't change visible flag }; enum ScInputMode { SC_INPUT_NONE, - SC_INPUT_TYPE, // Eingabe, ohne im Inplace-Modus zu sein - SC_INPUT_TABLE, // Textcursor in der Tabelle - SC_INPUT_TOP // Textcursor in der Eingabezeile + SC_INPUT_TYPE, // Eingabe, ohne im Inplace-Modus zu sein + SC_INPUT_TABLE, // Textcursor in der Tabelle + SC_INPUT_TOP // Textcursor in der Eingabezeile }; -enum ScVObjMode // Ausgabemodi von Objekten auf einer Seite +enum ScVObjMode // Ausgabemodi von Objekten auf einer Seite { VOBJ_MODE_SHOW, VOBJ_MODE_HIDE // #i80528# VOBJ_MODE_DUMMY removed, no longer supported }; -enum ScAnchorType // Verankerung eines Zeichenobjekts +enum ScAnchorType // Verankerung eines Zeichenobjekts { SCA_CELL, SCA_PAGE, - SCA_DONTKNOW // bei Mehrfachselektion + SCA_DONTKNOW // bei Mehrfachselektion }; enum ScGetDBMode { - SC_DB_MAKE, // wenn noetig, "unbenannt" anlegen - SC_DB_IMPORT, // wenn noetig, "Importx" anlegen - SC_DB_OLD // nicht neu anlegen + SC_DB_MAKE, // wenn noetig, "unbenannt" anlegen + SC_DB_IMPORT, // wenn noetig, "Importx" anlegen + SC_DB_OLD // nicht neu anlegen }; /// For ScDBFunc::GetDBData() @@ -429,23 +429,23 @@ enum ScGetDBSelection /** Shrink selection to actually used data area within the selection. */ SC_DBSEL_SHRINK_TO_USED_DATA, - /** If only one row or portion thereof is selected, shrink row to used data - columns and select further rows down until end of data. If an area is - selected, shrink rows to actually used columns. Else, no selection, + /** If only one row or portion thereof is selected, shrink row to used data + columns and select further rows down until end of data. If an area is + selected, shrink rows to actually used columns. Else, no selection, expand to used data area. */ SC_DBSEL_ROW_DOWN, - /** Behave as if the range corresponding to a ScDBData area was selected, + /** Behave as if the range corresponding to a ScDBData area was selected, for API use. */ SC_DBSEL_FORCE_MARK }; enum ScLkUpdMode -{ //Verknuepfungen - LM_ALWAYS, //immer aktualisieren - LM_NEVER, //niemals - LM_ON_DEMAND, //auf nachfrage - LM_UNKNOWN //Shit happens +{ //Verknuepfungen + LM_ALWAYS, //immer aktualisieren + LM_NEVER, //niemals + LM_ON_DEMAND, //auf nachfrage + LM_UNKNOWN //Shit happens }; @@ -464,24 +464,24 @@ enum ScDBObject struct ScImportParam { - SCCOL nCol1; - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bImport; - String aDBName; // Alias der Datenbank - String aStatement; - BOOL bNative; - BOOL bSql; // Statement oder Name? - BYTE nType; // enum DBObject + SCCOL nCol1; + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bImport; + String aDBName; // Alias der Datenbank + String aStatement; + BOOL bNative; + BOOL bSql; // Statement oder Name? + BYTE nType; // enum DBObject ScImportParam(); ScImportParam( const ScImportParam& r ); ~ScImportParam(); - ScImportParam& operator= ( const ScImportParam& r ); - BOOL operator== ( const ScImportParam& r ) const; -//UNUSED2009-05 void Clear (); + ScImportParam& operator= ( const ScImportParam& r ); + BOOL operator== ( const ScImportParam& r ) const; +//UNUSED2009-05 void Clear (); }; struct ScStringHashCode @@ -534,43 +534,43 @@ namespace utl { #ifndef _SCALC_EXE class ScGlobal { - static SvxSearchItem* pSearchItem; - static ScAutoFormat* pAutoFormat; - static FuncCollection* pFuncCollection; + static SvxSearchItem* pSearchItem; + static ScAutoFormat* pAutoFormat; + static FuncCollection* pFuncCollection; static ScUnoAddInCollection* pAddInCollection; - static ScUserList* pUserList; - static String** ppRscString; - static String* pStrScDoc; + static ScUserList* pUserList; + static String** ppRscString; + static String* pStrScDoc; static String* pEmptyString; - static String* pStrClipDocName; + static String* pStrClipDocName; static SvxBrushItem* pEmptyBrushItem; - static SvxBrushItem* pButtonBrushItem; - static SvxBrushItem* pEmbeddedBrushItem; - static SvxBrushItem* pProtectedBrushItem; + static SvxBrushItem* pButtonBrushItem; + static SvxBrushItem* pEmbeddedBrushItem; + static SvxBrushItem* pProtectedBrushItem; static ImageList* pOutlineBitmaps; static ImageList* pOutlineBitmapsHC; -// static Bitmap* pAnchorBitmap; -// static Bitmap* pGrayAnchorBitmap; +// static Bitmap* pAnchorBitmap; +// static Bitmap* pGrayAnchorBitmap; - static ScFunctionList* pStarCalcFunctionList; - static ScFunctionMgr* pStarCalcFunctionMgr; + static ScFunctionList* pStarCalcFunctionList; + static ScFunctionMgr* pStarCalcFunctionMgr; - static ScUnitConverter* pUnitConverter; + static ScUnitConverter* pUnitConverter; static SvNumberFormatter* pEnglishFormatter; // for UNO / XML export static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> xOrdinalSuffix; - static CalendarWrapper* pCalendar; - static CollatorWrapper* pCaseCollator; - static CollatorWrapper* pCollator; + static CalendarWrapper* pCalendar; + static CollatorWrapper* pCaseCollator; + static CollatorWrapper* pCollator; static ::utl::TransliterationWrapper* pTransliteration; static ::utl::TransliterationWrapper* pCaseTransliteration; static IntlWrapper* pScIntlWrapper; - static ::com::sun::star::lang::Locale* pLocale; + static ::com::sun::star::lang::Locale* pLocale; -public: +public: static SvtSysLocale* pSysLocale; // for faster access a pointer to the single instance provided by SvtSysLocale SC_DLLPUBLIC static const CharClass* pCharClass; @@ -579,87 +579,87 @@ public: SC_DLLPUBLIC static const LocaleDataWrapper* GetpLocaleData(); static CalendarWrapper* GetCalendar(); - SC_DLLPUBLIC static CollatorWrapper* GetCollator(); - static CollatorWrapper* GetCaseCollator(); + SC_DLLPUBLIC static CollatorWrapper* GetCollator(); + static CollatorWrapper* GetCaseCollator(); static IntlWrapper* GetScIntlWrapper(); - static ::com::sun::star::lang::Locale* GetLocale(); - + static ::com::sun::star::lang::Locale* GetLocale(); + SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001 static ::utl::TransliterationWrapper* GetCaseTransliteration(); - - SC_DLLPUBLIC static LanguageType eLnge; - static sal_Unicode cListDelimiter; - - static const String& GetClipDocName(); - static void SetClipDocName( const String& rNew ); - SC_DLLPUBLIC static const SvxSearchItem& GetSearchItem(); - SC_DLLPUBLIC static void SetSearchItem( const SvxSearchItem& rNew ); - SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat(); - static void ClearAutoFormat(); //BugId 54209 - static FuncCollection* GetFuncCollection(); + + SC_DLLPUBLIC static LanguageType eLnge; + static sal_Unicode cListDelimiter; + + static const String& GetClipDocName(); + static void SetClipDocName( const String& rNew ); + SC_DLLPUBLIC static const SvxSearchItem& GetSearchItem(); + SC_DLLPUBLIC static void SetSearchItem( const SvxSearchItem& rNew ); + SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat(); + static void ClearAutoFormat(); //BugId 54209 + static FuncCollection* GetFuncCollection(); SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection(); - SC_DLLPUBLIC static ScUserList* GetUserList(); - static void SetUserList( const ScUserList* pNewList ); - SC_DLLPUBLIC static const String& GetRscString( USHORT nIndex ); - static void OpenURL( const String& rURL, const String& rTarget ); - SC_DLLPUBLIC static String GetAbsDocName( const String& rFileName, + SC_DLLPUBLIC static ScUserList* GetUserList(); + static void SetUserList( const ScUserList* pNewList ); + SC_DLLPUBLIC static const String& GetRscString( USHORT nIndex ); + static void OpenURL( const String& rURL, const String& rTarget ); + SC_DLLPUBLIC static String GetAbsDocName( const String& rFileName, SfxObjectShell* pShell ); - SC_DLLPUBLIC static String GetDocTabName( const String& rFileName, + SC_DLLPUBLIC static String GetDocTabName( const String& rFileName, const String& rTabName ); - SC_DLLPUBLIC static ULONG GetStandardFormat( SvNumberFormatter&, + SC_DLLPUBLIC static ULONG GetStandardFormat( SvNumberFormatter&, ULONG nFormat, short nType ); - SC_DLLPUBLIC static ULONG GetStandardFormat( double, SvNumberFormatter&, + SC_DLLPUBLIC static ULONG GetStandardFormat( double, SvNumberFormatter&, ULONG nFormat, short nType ); - SC_DLLPUBLIC static double nScreenPPTX; - SC_DLLPUBLIC static double nScreenPPTY; + SC_DLLPUBLIC static double nScreenPPTX; + SC_DLLPUBLIC static double nScreenPPTY; - static ScDocShellRef* pDrawClipDocShellRef; + static ScDocShellRef* pDrawClipDocShellRef; - static USHORT nDefFontHeight; - static USHORT nStdRowHeight; + static USHORT nDefFontHeight; + static USHORT nStdRowHeight; - SC_DLLPUBLIC static long nLastRowHeightExtra; - static long nLastColWidthExtra; + SC_DLLPUBLIC static long nLastRowHeightExtra; + static long nLastColWidthExtra; - static void Init(); // am Anfang + static void Init(); // am Anfang static void InitAddIns(); - static void Clear(); // bei Programmende + static void Clear(); // bei Programmende - static void UpdatePPT(OutputDevice* pDev); + static void UpdatePPT(OutputDevice* pDev); static void InitTextHeight(SfxItemPool* pPool); - static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } + static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } static SvxBrushItem* GetButtonBrushItem(); - static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } - static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } - SC_DLLPUBLIC static const String& GetEmptyString(); - static const String& GetScDocString(); + static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } + static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } + SC_DLLPUBLIC static const String& GetEmptyString(); + static const String& GetScDocString(); /** Returns the specified image list with outline symbols. @param bHC false = standard symbols; true = high contrast symbols. */ static ImageList* GetOutlineSymbols( bool bHC ); -// static const Bitmap& GetAnchorBitmap(); -// static const Bitmap& GetGrayAnchorBitmap(); +// static const Bitmap& GetAnchorBitmap(); +// static const Bitmap& GetGrayAnchorBitmap(); static bool HasStarCalcFunctionList(); - static ScFunctionList* GetStarCalcFunctionList(); - static ScFunctionMgr* GetStarCalcFunctionMgr(); + static ScFunctionList* GetStarCalcFunctionList(); + static ScFunctionMgr* GetStarCalcFunctionMgr(); static void ResetFunctionList(); - static String GetErrorString(USHORT nErrNumber); - static String GetLongErrorString(USHORT nErrNumber); - static BOOL EETextObjEqual( const EditTextObject* pObj1, + static String GetErrorString(USHORT nErrNumber); + static String GetLongErrorString(USHORT nErrNumber); + static BOOL EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ); - static BOOL CheckWidthInvalidate( BOOL& bNumFormatChanged, + static BOOL CheckWidthInvalidate( BOOL& bNumFormatChanged, const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs ); - static BOOL HasAttrChanged( const SfxItemSet& rNewAttrs, + static BOOL HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs, - const USHORT nWhich ); + const USHORT nWhich ); - static ScUnitConverter* GetUnitConverter(); + static ScUnitConverter* GetUnitConverter(); /// strchr() functionality on unicode, as long as we need it for ScToken etc. static const sal_Unicode* UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ); @@ -711,15 +711,15 @@ SC_DLLPUBLIC static xub_StrLen FindUnquoted( const String& rString, sal SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' ); - static CharSet GetCharsetValue( const String& rCharSet ); - static String GetCharsetString( CharSet eVal ); + static CharSet GetCharsetValue( const String& rCharSet ); + static String GetCharsetString( CharSet eVal ); /// a "ReadOnly" formatter for UNO/XML export static SvNumberFormatter* GetEnglishFormatter(); - static BOOL IsSystemRTL(); // depending on system language - static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage - SC_DLLPUBLIC static BYTE GetDefaultScriptType(); // for all WEAK characters + static BOOL IsSystemRTL(); // depending on system language + static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage + SC_DLLPUBLIC static BYTE GetDefaultScriptType(); // for all WEAK characters /** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs. If more than one SCRIPTTYPE_... values are or'ed together, prefers first COMPLEX, then ASIAN */ @@ -769,18 +769,18 @@ enum ScQueryConnect enum ScSubTotalFunc { - SUBTOTAL_FUNC_NONE = 0, - SUBTOTAL_FUNC_AVE = 1, - SUBTOTAL_FUNC_CNT = 2, - SUBTOTAL_FUNC_CNT2 = 3, - SUBTOTAL_FUNC_MAX = 4, - SUBTOTAL_FUNC_MIN = 5, - SUBTOTAL_FUNC_PROD = 6, - SUBTOTAL_FUNC_STD = 7, - SUBTOTAL_FUNC_STDP = 8, - SUBTOTAL_FUNC_SUM = 9, - SUBTOTAL_FUNC_VAR = 10, - SUBTOTAL_FUNC_VARP = 11 + SUBTOTAL_FUNC_NONE = 0, + SUBTOTAL_FUNC_AVE = 1, + SUBTOTAL_FUNC_CNT = 2, + SUBTOTAL_FUNC_CNT2 = 3, + SUBTOTAL_FUNC_MAX = 4, + SUBTOTAL_FUNC_MIN = 5, + SUBTOTAL_FUNC_PROD = 6, + SUBTOTAL_FUNC_STD = 7, + SUBTOTAL_FUNC_STDP = 8, + SUBTOTAL_FUNC_SUM = 9, + SUBTOTAL_FUNC_VAR = 10, + SUBTOTAL_FUNC_VARP = 11 }; @@ -792,8 +792,8 @@ enum ScSubTotalFunc * Verbindung mit dem Schalter bQueryByString auf FALSE. */ -#define SC_EMPTYFIELDS ((double)0x0042) -#define SC_NONEMPTYFIELDS ((double)0x0043) +#define SC_EMPTYFIELDS ((double)0x0042) +#define SC_NONEMPTYFIELDS ((double)0x0043) namespace utl { @@ -803,62 +803,62 @@ namespace utl struct ScQueryEntry { - BOOL bDoQuery; - BOOL bQueryByString; + BOOL bDoQuery; + BOOL bQueryByString; bool bQueryByDate; - SCCOLROW nField; - ScQueryOp eOp; + SCCOLROW nField; + ScQueryOp eOp; ScQueryConnect eConnect; - String* pStr; - double nVal; - utl::SearchParam* pSearchParam; // falls RegExp, nicht gespeichert - utl::TextSearch* pSearchText; // falls RegExp, nicht gespeichert + String* pStr; + double nVal; + utl::SearchParam* pSearchParam; // falls RegExp, nicht gespeichert + utl::TextSearch* pSearchText; // falls RegExp, nicht gespeichert ScQueryEntry(); ScQueryEntry(const ScQueryEntry& r); ~ScQueryEntry(); // legt ggbf. pSearchParam und pSearchText an, immer RegExp! - utl::TextSearch* GetSearchTextPtr( BOOL bCaseSens ); + utl::TextSearch* GetSearchTextPtr( BOOL bCaseSens ); - void Clear(); - ScQueryEntry& operator=( const ScQueryEntry& r ); - BOOL operator==( const ScQueryEntry& r ) const; + void Clear(); + ScQueryEntry& operator=( const ScQueryEntry& r ); + BOOL operator==( const ScQueryEntry& r ) const; }; // ----------------------------------------------------------------------- struct SC_DLLPUBLIC ScSubTotalParam { - SCCOL nCol1; // Selektierter Bereich - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bRemoveOnly; - BOOL bReplace; // vorhandene Ergebnisse ersetzen - BOOL bPagebreak; // Seitenumbruch bei Gruppenwechsel - BOOL bCaseSens; // Gross-/Kleinschreibung - BOOL bDoSort; // vorher sortieren - BOOL bAscending; // aufsteigend sortieren - BOOL bUserDef; // Benutzer-def. Sort.Reihenfolge - USHORT nUserIndex; // Index auf Liste - BOOL bIncludePattern; // Formate mit sortieren - BOOL bGroupActive[MAXSUBTOTAL]; // aktive Gruppen - SCCOL nField[MAXSUBTOTAL]; // zugehoeriges Feld - SCCOL nSubTotals[MAXSUBTOTAL]; // Anzahl der SubTotals - SCCOL* pSubTotals[MAXSUBTOTAL]; // Array der zu berechnenden Spalten - ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Array der zugehoerige Funktionen + SCCOL nCol1; // Selektierter Bereich + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bRemoveOnly; + BOOL bReplace; // vorhandene Ergebnisse ersetzen + BOOL bPagebreak; // Seitenumbruch bei Gruppenwechsel + BOOL bCaseSens; // Gross-/Kleinschreibung + BOOL bDoSort; // vorher sortieren + BOOL bAscending; // aufsteigend sortieren + BOOL bUserDef; // Benutzer-def. Sort.Reihenfolge + USHORT nUserIndex; // Index auf Liste + BOOL bIncludePattern; // Formate mit sortieren + BOOL bGroupActive[MAXSUBTOTAL]; // aktive Gruppen + SCCOL nField[MAXSUBTOTAL]; // zugehoeriges Feld + SCCOL nSubTotals[MAXSUBTOTAL]; // Anzahl der SubTotals + SCCOL* pSubTotals[MAXSUBTOTAL]; // Array der zu berechnenden Spalten + ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Array der zugehoerige Funktionen ScSubTotalParam(); ScSubTotalParam( const ScSubTotalParam& r ); - ScSubTotalParam& operator= ( const ScSubTotalParam& r ); - BOOL operator== ( const ScSubTotalParam& r ) const; - void Clear (); - void SetSubTotals ( USHORT nGroup, - const SCCOL* ptrSubTotals, - const ScSubTotalFunc* ptrFuncions, - USHORT nCount ); + ScSubTotalParam& operator= ( const ScSubTotalParam& r ); + BOOL operator== ( const ScSubTotalParam& r ) const; + void Clear (); + void SetSubTotals ( USHORT nGroup, + const SCCOL* ptrSubTotals, + const ScSubTotalFunc* ptrFuncions, + USHORT nCount ); }; // ----------------------------------------------------------------------- @@ -866,25 +866,25 @@ class ScArea; struct ScConsolidateParam { - SCCOL nCol; // Cursor Position / - SCROW nRow; // bzw. Anfang des Zielbereiches - SCTAB nTab; - ScSubTotalFunc eFunction; // Berechnungsvorschrift - USHORT nDataAreaCount; // Anzahl der Datenbereiche - ScArea** ppDataAreas; // Zeiger-Array auf Datenbereiche - BOOL bByCol; // nach Spalten - BOOL bByRow; // nach Zeilen - BOOL bReferenceData; // Quelldaten referenzieren + SCCOL nCol; // Cursor Position / + SCROW nRow; // bzw. Anfang des Zielbereiches + SCTAB nTab; + ScSubTotalFunc eFunction; // Berechnungsvorschrift + USHORT nDataAreaCount; // Anzahl der Datenbereiche + ScArea** ppDataAreas; // Zeiger-Array auf Datenbereiche + BOOL bByCol; // nach Spalten + BOOL bByRow; // nach Zeilen + BOOL bReferenceData; // Quelldaten referenzieren ScConsolidateParam(); ScConsolidateParam( const ScConsolidateParam& r ); ~ScConsolidateParam(); - ScConsolidateParam& operator= ( const ScConsolidateParam& r ); - BOOL operator== ( const ScConsolidateParam& r ) const; - void Clear (); // = ClearDataAreas()+Members - void ClearDataAreas (); - void SetAreas ( ScArea* const* ppAreas, USHORT nCount ); + ScConsolidateParam& operator= ( const ScConsolidateParam& r ); + BOOL operator== ( const ScConsolidateParam& r ) const; + void Clear (); // = ClearDataAreas()+Members + void ClearDataAreas (); + void SetAreas ( ScArea* const* ppAreas, USHORT nCount ); }; // ----------------------------------------------------------------------- diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 31934067988a..a783120246d0 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.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 @@ -29,84 +29,84 @@ #define __GLOBSTR_HRC_ -#define STR_UNDO_DELETECELLS 1 -#define STR_UNDO_CUT 2 -#define STR_UNDO_PASTE 3 -#define STR_UNDO_MOVE 4 -#define STR_UNDO_COPY 5 -#define STR_UNDO_DELETECONTENTS 6 -#define STR_UNDO_SELATTR 7 -#define STR_UNDO_SELATTRLINES 8 -#define STR_UNDO_COLWIDTH 9 -#define STR_UNDO_OPTCOLWIDTH 10 -#define STR_UNDO_ROWHEIGHT 11 -#define STR_UNDO_OPTROWHEIGHT 12 -#define STR_UNDO_AUTOFILL 13 -#define STR_UNDO_MERGE 14 -#define STR_UNDO_REMERGE 15 -#define STR_UNDO_AUTOFORMAT 16 -#define STR_UNDO_REPLACE 17 -#define STR_UNDO_CURSORATTR 18 -#define STR_UNDO_ENTERDATA 19 -#define STR_UNDO_INSCOLBREAK 20 -#define STR_UNDO_DELCOLBREAK 21 -#define STR_UNDO_INSROWBREAK 22 -#define STR_UNDO_DELROWBREAK 23 -#define STR_UNDO_DOOUTLINE 24 -#define STR_UNDO_REDOOUTLINE 25 -#define STR_UNDO_MAKEOUTLINE 26 -#define STR_UNDO_REMAKEOUTLINE 27 -#define STR_UNDO_OUTLINELEVEL 28 -#define STR_UNDO_DOOUTLINEBLK 29 -#define STR_UNDO_REDOOUTLINEBLK 30 -#define STR_UNDO_REMOVEALLOTLNS 31 -#define STR_UNDO_AUTOOUTLINE 32 -#define STR_UNDO_SUBTOTALS 33 -#define STR_UNDO_SORT 34 -#define STR_UNDO_QUERY 35 -#define STR_UNDO_DBDATA 36 -#define STR_UNDO_IMPORTDATA 37 -#define STR_UNDO_REPEATDB 38 - -#define STR_DB_NONAME 39 - -#define STR_MSSG_DOSUBTOTALS_0 40 -#define STR_MSSG_DOSUBTOTALS_1 41 -#define STR_MSSG_DOSUBTOTALS_2 42 -#define STR_MSSG_REPEATDB_0 43 -#define STR_MSSG_MAKEAUTOFILTER_0 44 -#define STR_MSSG_IMPORTDATA_0 45 -#define STR_MSSG_MAKEOUTLINE_0 46 -#define STR_MSSG_REMOVEOUTLINE_0 47 -#define STR_MSSG_PASTEFROMCLIP_0 48 -#define STR_MSSG_PASTEFROMCLIP_1 49 -#define STR_MSSG_MOVEBLOCKTO_0 50 -#define STR_MSSG_INSERTCELLS_0 52 -#define STR_MSSG_DELETECELLS_0 53 -#define STR_MSSG_MERGECELLS_0 54 -#define STR_MSSG_SEARCHANDREPLACE_0 55 -#define STR_MSSG_SOLVE_0 56 -#define STR_MSSG_SOLVE_1 57 -#define STR_MSSG_SOLVE_2 58 -#define STR_MSSG_SOLVE_3 59 -#define STR_MSSG_SOLVE_4 60 -#define STR_MSSG_SOLVE_5 61 -#define STR_MSSG_SOLVE_6 62 +#define STR_UNDO_DELETECELLS 1 +#define STR_UNDO_CUT 2 +#define STR_UNDO_PASTE 3 +#define STR_UNDO_MOVE 4 +#define STR_UNDO_COPY 5 +#define STR_UNDO_DELETECONTENTS 6 +#define STR_UNDO_SELATTR 7 +#define STR_UNDO_SELATTRLINES 8 +#define STR_UNDO_COLWIDTH 9 +#define STR_UNDO_OPTCOLWIDTH 10 +#define STR_UNDO_ROWHEIGHT 11 +#define STR_UNDO_OPTROWHEIGHT 12 +#define STR_UNDO_AUTOFILL 13 +#define STR_UNDO_MERGE 14 +#define STR_UNDO_REMERGE 15 +#define STR_UNDO_AUTOFORMAT 16 +#define STR_UNDO_REPLACE 17 +#define STR_UNDO_CURSORATTR 18 +#define STR_UNDO_ENTERDATA 19 +#define STR_UNDO_INSCOLBREAK 20 +#define STR_UNDO_DELCOLBREAK 21 +#define STR_UNDO_INSROWBREAK 22 +#define STR_UNDO_DELROWBREAK 23 +#define STR_UNDO_DOOUTLINE 24 +#define STR_UNDO_REDOOUTLINE 25 +#define STR_UNDO_MAKEOUTLINE 26 +#define STR_UNDO_REMAKEOUTLINE 27 +#define STR_UNDO_OUTLINELEVEL 28 +#define STR_UNDO_DOOUTLINEBLK 29 +#define STR_UNDO_REDOOUTLINEBLK 30 +#define STR_UNDO_REMOVEALLOTLNS 31 +#define STR_UNDO_AUTOOUTLINE 32 +#define STR_UNDO_SUBTOTALS 33 +#define STR_UNDO_SORT 34 +#define STR_UNDO_QUERY 35 +#define STR_UNDO_DBDATA 36 +#define STR_UNDO_IMPORTDATA 37 +#define STR_UNDO_REPEATDB 38 + +#define STR_DB_NONAME 39 + +#define STR_MSSG_DOSUBTOTALS_0 40 +#define STR_MSSG_DOSUBTOTALS_1 41 +#define STR_MSSG_DOSUBTOTALS_2 42 +#define STR_MSSG_REPEATDB_0 43 +#define STR_MSSG_MAKEAUTOFILTER_0 44 +#define STR_MSSG_IMPORTDATA_0 45 +#define STR_MSSG_MAKEOUTLINE_0 46 +#define STR_MSSG_REMOVEOUTLINE_0 47 +#define STR_MSSG_PASTEFROMCLIP_0 48 +#define STR_MSSG_PASTEFROMCLIP_1 49 +#define STR_MSSG_MOVEBLOCKTO_0 50 +#define STR_MSSG_INSERTCELLS_0 52 +#define STR_MSSG_DELETECELLS_0 53 +#define STR_MSSG_MERGECELLS_0 54 +#define STR_MSSG_SEARCHANDREPLACE_0 55 +#define STR_MSSG_SOLVE_0 56 +#define STR_MSSG_SOLVE_1 57 +#define STR_MSSG_SOLVE_2 58 +#define STR_MSSG_SOLVE_3 59 +#define STR_MSSG_SOLVE_4 60 +#define STR_MSSG_SOLVE_5 61 +#define STR_MSSG_SOLVE_6 62 // unused: 63 -#define STR_TABLE_GESAMTERGEBNIS 64 -#define STR_TABLE_ERGEBNIS 65 -#define STR_UNDO_SPELLING 66 -#define STR_TABLE_UND 67 -#define STR_TABLE_ODER 68 -#define STR_UNDO_INSERTCELLS 69 +#define STR_TABLE_GESAMTERGEBNIS 64 +#define STR_TABLE_ERGEBNIS 65 +#define STR_UNDO_SPELLING 66 +#define STR_TABLE_UND 67 +#define STR_TABLE_ODER 68 +#define STR_UNDO_INSERTCELLS 69 #define STR_TABLE_DEF 70 //#define STR_STYLENAME_STANDARD 71 s.u. #define STR_MOVE_TO_END 72 -#define STR_BOX_YNI 73 -#define STR_NO_REF_TABLE 74 +#define STR_BOX_YNI 73 +#define STR_NO_REF_TABLE 74 -#define STR_PIVOTFUNC_SUM 75 // pivot.cxx +#define STR_PIVOTFUNC_SUM 75 // pivot.cxx #define STR_PIVOTFUNC_COUNT 76 #define STR_PIVOTFUNC_AVG 77 #define STR_PIVOTFUNC_MAX 78 @@ -117,71 +117,71 @@ #define STR_PIVOTFUNC_STDDEV2 92 #define STR_PIVOTFUNC_VAR 93 #define STR_PIVOTFUNC_VAR2 94 -#define STR_PIVOT_TOTAL 95 -#define STR_PIVOT_DATA 96 +#define STR_PIVOT_TOTAL 95 +#define STR_PIVOT_DATA 96 -#define STR_PIVOT_INVALID_DBAREA 97 // tabvwsh3.cxx +#define STR_PIVOT_INVALID_DBAREA 97 // tabvwsh3.cxx -#define STR_TABLE 98 -#define STR_COLUMN 99 +#define STR_TABLE 98 +#define STR_COLUMN 99 #define STR_ROW 100 #define STR_LOAD_DOC 101 #define STR_SAVE_DOC 102 -#define STR_ERR_INVALID_TABREF 103 -#define STR_AREA_ALREADY_INSERTED 104 -#define STR_INVALID_TABREF 105 -#define STR_INVALID_QUERYAREA 106 +#define STR_ERR_INVALID_TABREF 103 +#define STR_AREA_ALREADY_INSERTED 104 +#define STR_INVALID_TABREF 105 +#define STR_INVALID_QUERYAREA 106 -#define STR_REIMPORT_EMPTY 107 -#define STR_NOMULTISELECT 108 -#define STR_FILL_SERIES_PROGRESS 109 // documen3.cxx +#define STR_REIMPORT_EMPTY 107 +#define STR_NOMULTISELECT 108 +#define STR_FILL_SERIES_PROGRESS 109 // documen3.cxx #define STR_UNKNOWN_FILTER 110 -#define STR_DATABASE_NOTFOUND 111 -#define STR_DATABASE_ABORTED 112 +#define STR_DATABASE_NOTFOUND 111 +#define STR_DATABASE_ABORTED 112 -#define STR_UNDO_PRINTRANGES 113 +#define STR_UNDO_PRINTRANGES 113 -#define STR_UNDO_DEC_INDENT 114 -#define STR_UNDO_INC_INDENT 115 -#define STR_UNDO_THESAURUS 116 +#define STR_UNDO_DEC_INDENT 114 +#define STR_UNDO_INC_INDENT 115 +#define STR_UNDO_THESAURUS 116 #define STR_FILL_TAB 117 -#define STR_NO_VALUE 118 /* moved to compiler.src, keep define! */ +#define STR_NO_VALUE 118 /* moved to compiler.src, keep define! */ #define STR_UPDATE_SCENARIO 119 #define STR_ERR_NEWSCENARIO 120 #define STR_SCENARIO 121 #define STR_PIVOT_TABLE 122 #define STR_NEWTABNAMENOTUNIQUE 123 -#define STR_FUN_TEXT_SUM 124 -#define STR_FUN_TEXT_COUNT 125 -#define STR_FUN_TEXT_AVG 126 -#define STR_FUN_TEXT_MAX 127 -#define STR_FUN_TEXT_MIN 128 -#define STR_FUN_TEXT_PRODUCT 129 -#define STR_FUN_TEXT_STDDEV 130 -#define STR_FUN_TEXT_VAR 131 -#define STR_DOC_STAT 132 +#define STR_FUN_TEXT_SUM 124 +#define STR_FUN_TEXT_COUNT 125 +#define STR_FUN_TEXT_AVG 126 +#define STR_FUN_TEXT_MAX 127 +#define STR_FUN_TEXT_MIN 128 +#define STR_FUN_TEXT_PRODUCT 129 +#define STR_FUN_TEXT_STDDEV 130 +#define STR_FUN_TEXT_VAR 131 +#define STR_DOC_STAT 132 //#define STR_STYLENAME_RESULT 133 s.u. -#define STR_DBNAME_IMPORT 134 +#define STR_DBNAME_IMPORT 134 -#define STR_NOCHARTATCURSOR 135 +#define STR_NOCHARTATCURSOR 135 #define STR_NOAREASELECTED 136 #define STR_INVALIDTABNAME 137 -#define STR_PIVOT_NOTFOUND 138 -#define STR_ERROR_STR 139 -#define STR_NV_STR 140 /* moved to compiler.src, keep define! */ -#define STR_EMPTYDATA 141 -#define STR_PIVOT_NODATA 142 -#define STR_PIVOT_MOVENOTALLOWED 143 +#define STR_PIVOT_NOTFOUND 138 +#define STR_ERROR_STR 139 +#define STR_NV_STR 140 /* moved to compiler.src, keep define! */ +#define STR_EMPTYDATA 141 +#define STR_PIVOT_NODATA 142 +#define STR_PIVOT_MOVENOTALLOWED 143 -#define STR_PRINT_INVALID_AREA 144 +#define STR_PRINT_INVALID_AREA 144 #define STR_PAGESTYLE 145 #define STR_HEADER 146 @@ -199,39 +199,39 @@ #define STR_HFCMD_TABLE 155 #define HFCMD_END 155 -#define STR_PROTECTIONERR 156 +#define STR_PROTECTIONERR 156 #define STR_PAGEHEADER 157 #define STR_PAGEFOOTER 158 #define STR_PAGE 159 -#define STR_LONG_ERR_ILL_ARG 160 -#define STR_LONG_ERR_ILL_PAR 161 -#define STR_LONG_ERR_ILL_FPO 162 -#define STR_LONG_ERR_ILL_CHAR 163 -#define STR_LONG_ERR_ILL_SEP 164 -#define STR_LONG_ERR_PAIR 165 -#define STR_LONG_ERR_OP_EXP 166 -#define STR_LONG_ERR_VAR_EXP 167 -#define STR_LONG_ERR_CODE_OVF 168 -#define STR_LONG_ERR_STR_OVF 169 -#define STR_LONG_ERR_STACK_OVF 170 -#define STR_LONG_ERR_SYNTAX 171 -#define STR_LONG_ERR_CIRC_REF 172 -#define STR_LONG_ERR_NO_NAME 173 -#define STR_LONG_ERR_NO_REF 174 -#define STR_LONG_ERR_NO_CONV 175 -#define STR_LONG_ERR_NO_VALUE 176 -#define STR_LONG_ERR_NV 177 +#define STR_LONG_ERR_ILL_ARG 160 +#define STR_LONG_ERR_ILL_PAR 161 +#define STR_LONG_ERR_ILL_FPO 162 +#define STR_LONG_ERR_ILL_CHAR 163 +#define STR_LONG_ERR_ILL_SEP 164 +#define STR_LONG_ERR_PAIR 165 +#define STR_LONG_ERR_OP_EXP 166 +#define STR_LONG_ERR_VAR_EXP 167 +#define STR_LONG_ERR_CODE_OVF 168 +#define STR_LONG_ERR_STR_OVF 169 +#define STR_LONG_ERR_STACK_OVF 170 +#define STR_LONG_ERR_SYNTAX 171 +#define STR_LONG_ERR_CIRC_REF 172 +#define STR_LONG_ERR_NO_NAME 173 +#define STR_LONG_ERR_NO_REF 174 +#define STR_LONG_ERR_NO_CONV 175 +#define STR_LONG_ERR_NO_VALUE 176 +#define STR_LONG_ERR_NV 177 #define STR_GRIDCOLOR 178 -#define STR_MERGE_NOTEMPTY 179 -#define STR_CELL_FILTER 180 +#define STR_MERGE_NOTEMPTY 179 +#define STR_CELL_FILTER 180 -#define STR_TARGETNOTFOUND 181 +#define STR_TARGETNOTFOUND 181 #define STR_INVALID_EPS 182 -#define STR_TABLE_OP 183 // documen4.cxx -#define STR_UNDO_TABOP 184 +#define STR_TABLE_OP 183 // documen4.cxx +#define STR_UNDO_TABOP 184 #define STR_INVALID_AFNAME 185 @@ -245,45 +245,45 @@ #define STR_INVALID_AFAREA 193 -#define STR_CASCADE 194 // Funktionsautopilot -#define STR_OPTIONAL 195 -#define STR_REQUIRED 196 -#define STR_EDITFUNCTION 197 -#define STR_INVALID 198 +#define STR_CASCADE 194 // Funktionsautopilot +#define STR_OPTIONAL 195 +#define STR_REQUIRED 196 +#define STR_EDITFUNCTION 197 +#define STR_INVALID 198 -#define STR_NOTES 199 +#define STR_NOTES 199 #define STR_QUERY_DELTAB 200 -#define STR_UNDO_DETREFRESH 201 +#define STR_UNDO_DETREFRESH 201 -#define STR_UNDO_SHOWNOTE 202 -#define STR_UNDO_HIDENOTE 203 -#define STR_UNDO_DRAGDROP 204 +#define STR_UNDO_SHOWNOTE 202 +#define STR_UNDO_HIDENOTE 203 +#define STR_UNDO_DRAGDROP 204 -#define STR_EXPORT_ASCII_WARNING 205 -#define STR_IMPORT_ERROR 206 -#define STR_IMPORT_ASCII 207 -#define STR_IMPORT_LOTUS 208 -#define STR_IMPORT_DBF 209 -#define STR_EXPORT_ASCII 210 +#define STR_EXPORT_ASCII_WARNING 205 +#define STR_IMPORT_ERROR 206 +#define STR_IMPORT_ASCII 207 +#define STR_IMPORT_LOTUS 208 +#define STR_IMPORT_DBF 209 +#define STR_EXPORT_ASCII 210 -#define STR_STYLENAME_STANDARD 71 +#define STR_STYLENAME_STANDARD 71 #define STR_STYLENAME_RESULT 133 -#define STR_STYLENAME_RESULT1 211 -#define STR_STYLENAME_HEADLINE 212 -#define STR_STYLENAME_HEADLINE1 213 -#define STR_STYLENAME_REPORT 214 -#define STR_STYLENAME_REPORT1 215 - -#define STR_PIVOT_ERROR 216 -#define STR_PIVOT_PROGRESS 217 +#define STR_STYLENAME_RESULT1 211 +#define STR_STYLENAME_HEADLINE 212 +#define STR_STYLENAME_HEADLINE1 213 +#define STR_STYLENAME_REPORT 214 +#define STR_STYLENAME_REPORT1 215 + +#define STR_PIVOT_ERROR 216 +#define STR_PIVOT_PROGRESS 217 #define STR_IMPORT_EXCEL_WARNING 218 #define STR_SPELLING_STOP_OK 219 -#define STR_THESAURUS_NO_STRING 220 +#define STR_THESAURUS_NO_STRING 220 #define STR_SPELLING_BEGIN_TAB 221 -#define STR_SPELLING_NO_LANG 222 // kann spaeter wieder raus +#define STR_SPELLING_NO_LANG 222 // kann spaeter wieder raus -#define STR_UNDO_GRAFEDIT 223 +#define STR_UNDO_GRAFEDIT 223 #define STR_NOLANGERR 224 @@ -294,215 +294,215 @@ #define STR_UNDO_COPY_TAB 229 #define STR_UNDO_APPEND_TAB 230 -#define STR_CHART_MAINTITLE 231 -#define STR_CHART_SUBTITLE 232 -#define STR_CHART_XTITLE 233 -#define STR_CHART_YTITLE 234 -#define STR_CHART_ZTITLE 235 +#define STR_CHART_MAINTITLE 231 +#define STR_CHART_SUBTITLE 232 +#define STR_CHART_XTITLE 233 +#define STR_CHART_YTITLE 234 +#define STR_CHART_ZTITLE 235 -#define STR_ABSREFLOST 236 -#define STR_NAMECONFLICT 237 +#define STR_ABSREFLOST 236 +#define STR_NAMECONFLICT 237 #define STR_ERR_AUTOFILTER 238 -#define STR_MSSG_SEARCHANDREPLACE_1 239 -#define STR_MSSG_SEARCHANDREPLACE_2 240 -#define STR_MSSG_SEARCHANDREPLACE_3 241 - -#define STR_CREATENAME_REPLACE 242 -#define STR_CREATENAME_MARKERR 243 - -#define STR_UNDO_LISTNAMES 244 -#define STR_UNDO_PIVOT_NEW 245 -#define STR_UNDO_PIVOT_MODIFY 246 -#define STR_UNDO_PIVOT_DELETE 247 -#define STR_UNDO_CONSOLIDATE 248 -#define STR_UNDO_USESCENARIO 249 -#define STR_UNDO_MAKESCENARIO 250 - -#define STR_CONSOLIDATE_ERR1 251 -#define STR_SCENARIO_NOTFOUND 252 - -#define STR_UNDO_APPLYCELLSTYLE 253 - -#define STR_UNDO_DETADDPRED 254 -#define STR_UNDO_DETDELPRED 255 -#define STR_UNDO_DETADDSUCC 256 -#define STR_UNDO_DETDELSUCC 257 -#define STR_UNDO_DETADDERROR 258 -#define STR_UNDO_DETDELALL 259 - -#define STR_QUERY_DELENTRY 260 - -#define STR_VOBJ_OBJECT 261 -#define STR_VOBJ_CHART 262 -#define STR_VOBJ_DRAWINGS 263 -#define STR_VOBJ_MODE_SHOW 264 -#define STR_VOBJ_MODE_HIDE 265 -//#i80528##define STR_VOBJ_MODE_DUMMY 266 - -#define STR_SCATTR_PAGE_TOPDOWN 267 -#define STR_SCATTR_PAGE_LEFTRIGHT 268 -#define STR_SCATTR_PAGE_NOTES 269 -#define STR_SCATTR_PAGE_GRID 270 -#define STR_SCATTR_PAGE_HEADERS 271 -#define STR_SCATTR_PAGE_FORMULAS 272 -#define STR_SCATTR_PAGE_NULLVALS 273 -#define STR_SCATTR_PAGE_PRINTDIR 274 -#define STR_SCATTR_PAGE_FIRSTPAGENO 275 -#define STR_SCATTR_PAGE_SCALE 276 +#define STR_MSSG_SEARCHANDREPLACE_1 239 +#define STR_MSSG_SEARCHANDREPLACE_2 240 +#define STR_MSSG_SEARCHANDREPLACE_3 241 + +#define STR_CREATENAME_REPLACE 242 +#define STR_CREATENAME_MARKERR 243 + +#define STR_UNDO_LISTNAMES 244 +#define STR_UNDO_PIVOT_NEW 245 +#define STR_UNDO_PIVOT_MODIFY 246 +#define STR_UNDO_PIVOT_DELETE 247 +#define STR_UNDO_CONSOLIDATE 248 +#define STR_UNDO_USESCENARIO 249 +#define STR_UNDO_MAKESCENARIO 250 + +#define STR_CONSOLIDATE_ERR1 251 +#define STR_SCENARIO_NOTFOUND 252 + +#define STR_UNDO_APPLYCELLSTYLE 253 + +#define STR_UNDO_DETADDPRED 254 +#define STR_UNDO_DETDELPRED 255 +#define STR_UNDO_DETADDSUCC 256 +#define STR_UNDO_DETDELSUCC 257 +#define STR_UNDO_DETADDERROR 258 +#define STR_UNDO_DETDELALL 259 + +#define STR_QUERY_DELENTRY 260 + +#define STR_VOBJ_OBJECT 261 +#define STR_VOBJ_CHART 262 +#define STR_VOBJ_DRAWINGS 263 +#define STR_VOBJ_MODE_SHOW 264 +#define STR_VOBJ_MODE_HIDE 265 +//#i80528##define STR_VOBJ_MODE_DUMMY 266 + +#define STR_SCATTR_PAGE_TOPDOWN 267 +#define STR_SCATTR_PAGE_LEFTRIGHT 268 +#define STR_SCATTR_PAGE_NOTES 269 +#define STR_SCATTR_PAGE_GRID 270 +#define STR_SCATTR_PAGE_HEADERS 271 +#define STR_SCATTR_PAGE_FORMULAS 272 +#define STR_SCATTR_PAGE_NULLVALS 273 +#define STR_SCATTR_PAGE_PRINTDIR 274 +#define STR_SCATTR_PAGE_FIRSTPAGENO 275 +#define STR_SCATTR_PAGE_SCALE 276 #define STR_SCATTR_PAGE_SCALETOPAGES 277 -#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */ +#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */ // unused: 279 -#define STR_UNDO_CHARTDATA 280 -#define STR_UNDO_ORIGINALSIZE 281 +#define STR_UNDO_CHARTDATA 280 +#define STR_UNDO_ORIGINALSIZE 281 -#define STR_LINKERROR 282 -#define STR_LINKERRORFILE 283 -#define STR_LINKERRORTAB 284 -#define STR_UNDO_UPDATELINK 285 +#define STR_LINKERROR 282 +#define STR_LINKERRORFILE 283 +#define STR_LINKERRORTAB 284 +#define STR_UNDO_UPDATELINK 285 -#define STR_IMPORT_REPLACE 286 +#define STR_IMPORT_REPLACE 286 -#define STR_UNDO_REMOVELINK 287 +#define STR_UNDO_REMOVELINK 287 -#define STR_OVERVIEW 288 -#define STR_DOC_INFO 289 -#define STR_DOC_CREATED 290 -#define STR_DOC_MODIFIED 291 -#define STR_DOC_PRINTED 292 -#define STR_DOC_THEME 293 -#define STR_DOC_KEYWORDS 318 -#define STR_DOC_COMMENT 294 -#define STR_BY 295 -#define STR_ON 296 +#define STR_OVERVIEW 288 +#define STR_DOC_INFO 289 +#define STR_DOC_CREATED 290 +#define STR_DOC_MODIFIED 291 +#define STR_DOC_PRINTED 292 +#define STR_DOC_THEME 293 +#define STR_DOC_KEYWORDS 318 +#define STR_DOC_COMMENT 294 +#define STR_BY 295 +#define STR_ON 296 -#define STR_RELOAD_TABLES 297 +#define STR_RELOAD_TABLES 297 -#define STR_FILTER_TOOMANY 298 +#define STR_FILTER_TOOMANY 298 -#define STR_UNDO_ENTERMATRIX 299 +#define STR_UNDO_ENTERMATRIX 299 -#define STR_INSERT_FULL 300 -#define STR_TABINSERT_ERROR 301 -#define STR_PASTE_ERROR 302 -#define STR_PASTE_FULL 303 +#define STR_INSERT_FULL 300 +#define STR_TABINSERT_ERROR 301 +#define STR_PASTE_ERROR 302 +#define STR_PASTE_FULL 303 -#define STR_ERR_INVALID_AREA 304 +#define STR_ERR_INVALID_AREA 304 -#define STR_IMPORT_DIF 305 -#define STR_EXPORT_DIF 306 +#define STR_IMPORT_DIF 305 +#define STR_EXPORT_DIF 306 -#define STR_ERR_NOREF 307 -#define STR_FUN_TEXT_COUNT2 308 -#define STR_NO_NAME_REF 309 /* moved to compiler.src, keep define! */ +#define STR_ERR_NOREF 307 +#define STR_FUN_TEXT_COUNT2 308 +#define STR_NO_NAME_REF 309 /* moved to compiler.src, keep define! */ -#define STR_MATRIXFRAGMENTERR 310 +#define STR_MATRIXFRAGMENTERR 310 -#define STR_UNDO_SHOWTAB 311 -#define STR_UNDO_HIDETAB 312 -#define STR_UNDO_INSERTAREALINK 313 +#define STR_UNDO_SHOWTAB 311 +#define STR_UNDO_HIDETAB 312 +#define STR_UNDO_INSERTAREALINK 313 -#define STR_REIMPORT_AFTER_LOAD 314 +#define STR_REIMPORT_AFTER_LOAD 314 -#define STR_DETINVALID_OVERFLOW 315 -#define STR_GRAPHICNAME 316 -#define STR_INVALIDNAME 317 -// 318 ist oben -#define STR_ERR_LINKOVERLAP 319 +#define STR_DETINVALID_OVERFLOW 315 +#define STR_GRAPHICNAME 316 +#define STR_INVALIDNAME 317 +// 318 ist oben +#define STR_ERR_LINKOVERLAP 319 -#define STR_VALID_MACRONOTFOUND 320 -#define STR_VALID_DEFERROR 321 +#define STR_VALID_MACRONOTFOUND 320 +#define STR_VALID_DEFERROR 321 -#define STR_UNDO_DETINVALID 322 +#define STR_UNDO_DETINVALID 322 -#define STR_PROGRESS_CALCULATING 323 -#define STR_PROGRESS_SORTING 324 -#define STR_PROGRESS_HEIGHTING 325 +#define STR_PROGRESS_CALCULATING 323 +#define STR_PROGRESS_SORTING 324 +#define STR_PROGRESS_HEIGHTING 325 -#define STR_QUICKHELP_DELETE 326 +#define STR_QUICKHELP_DELETE 326 -#define STR_FUNCTIONLIST_MORE 327 +#define STR_FUNCTIONLIST_MORE 327 -#define STR_PIVOT_STYLE_INNER 328 -#define STR_PIVOT_STYLE_RESULT 329 -#define STR_PIVOT_STYLE_CATEGORY 330 -#define STR_PIVOT_STYLE_TITLE 331 -#define STR_PIVOT_STYLE_FIELDNAME 332 -#define STR_PIVOT_STYLE_TOP 333 +#define STR_PIVOT_STYLE_INNER 328 +#define STR_PIVOT_STYLE_RESULT 329 +#define STR_PIVOT_STYLE_CATEGORY 330 +#define STR_PIVOT_STYLE_TITLE 331 +#define STR_PIVOT_STYLE_FIELDNAME 332 +#define STR_PIVOT_STYLE_TOP 333 -#define STR_OPERATION_FILTER 334 -#define STR_OPERATION_SORT 335 -#define STR_OPERATION_SUBTOTAL 336 -#define STR_OPERATION_NONE 337 +#define STR_OPERATION_FILTER 334 +#define STR_OPERATION_SORT 335 +#define STR_OPERATION_SUBTOTAL 336 +#define STR_OPERATION_NONE 337 -#define STR_UNDO_PROTECT_TAB 338 -#define STR_UNDO_UNPROTECT_TAB 339 -#define STR_UNDO_PROTECT_DOC 340 -#define STR_UNDO_UNPROTECT_DOC 341 +#define STR_UNDO_PROTECT_TAB 338 +#define STR_UNDO_UNPROTECT_TAB 339 +#define STR_UNDO_PROTECT_DOC 340 +#define STR_UNDO_UNPROTECT_DOC 341 -#define STR_PROGRESS_IMPORT 342 +#define STR_PROGRESS_IMPORT 342 -#define STR_SORT_ERR_MERGED 343 +#define STR_SORT_ERR_MERGED 343 -#define STR_TIP_WIDTH 344 -#define STR_TIP_HEIGHT 345 -#define STR_TIP_HIDE 346 +#define STR_TIP_WIDTH 344 +#define STR_TIP_HEIGHT 345 +#define STR_TIP_HIDE 346 -#define STR_UNDO_REMOVEBREAKS 347 -#define STR_UNDO_PRINTSCALE 348 -#define STR_UNDO_DRAG_BREAK 349 +#define STR_UNDO_REMOVEBREAKS 347 +#define STR_UNDO_PRINTSCALE 348 +#define STR_UNDO_DRAG_BREAK 349 -#define STR_QUICKHELP_REF 350 +#define STR_QUICKHELP_REF 350 -#define STR_PIVOT_OVERLAP 351 -#define STR_PIVOT_NOTEMPTY 352 +#define STR_PIVOT_OVERLAP 351 +#define STR_PIVOT_NOTEMPTY 352 -#define STR_QUERY_NOTFOUND 353 +#define STR_QUERY_NOTFOUND 353 -#define STR_ERR_INSERTOBJ 354 +#define STR_ERR_INSERTOBJ 354 -#define STR_PROGRESS_COMPARING 355 +#define STR_PROGRESS_COMPARING 355 -#define STR_CHANGED_BLANK 356 -#define STR_CHANGED_CELL 357 -#define STR_CHANGED_INSERT 358 -#define STR_CHANGED_DELETE 359 -#define STR_CHANGED_MOVE 360 +#define STR_CHANGED_BLANK 356 +#define STR_CHANGED_CELL 357 +#define STR_CHANGED_INSERT 358 +#define STR_CHANGED_DELETE 359 +#define STR_CHANGED_MOVE 360 -#define STR_QUERY_DELSCENARIO 361 -#define STR_UNDO_EDITSCENARIO 362 +#define STR_QUERY_DELSCENARIO 361 +#define STR_UNDO_EDITSCENARIO 362 -#define STR_END_REDLINING_TITLE 363 -#define STR_END_REDLINING 364 +#define STR_END_REDLINING_TITLE 363 +#define STR_END_REDLINING 364 -#define STR_UNDO_EDITNOTE 365 -#define STR_TABREMOVE_ERROR 366 -#define STR_CLOSE_ERROR_LINK 367 -#define STR_UNDO_RANGENAMES 368 +#define STR_UNDO_EDITNOTE 365 +#define STR_TABREMOVE_ERROR 366 +#define STR_CLOSE_ERROR_LINK 367 +#define STR_UNDO_RANGENAMES 368 -#define STR_MSSG_SEARCHANDREPLACE_4 369 -#define STR_MSSG_SEARCHANDREPLACE_5 370 +#define STR_MSSG_SEARCHANDREPLACE_4 369 +#define STR_MSSG_SEARCHANDREPLACE_5 370 -#define STR_UNDO_RESIZEMATRIX 371 -#define STR_TIP_RESIZEMATRIX 372 +#define STR_UNDO_RESIZEMATRIX 371 +#define STR_TIP_RESIZEMATRIX 372 -#define STR_READONLYERR 373 +#define STR_READONLYERR 373 -#define STR_PASTE_BIGGER 374 +#define STR_PASTE_BIGGER 374 -#define STR_MACRO_WARNING 375 +#define STR_MACRO_WARNING 375 -#define STR_EXPORT_DBF 376 +#define STR_EXPORT_DBF 376 -#define STR_UNDO_APPLYPAGESTYLE 377 -#define STR_UNDO_EDITCELLSTYLE 378 -#define STR_UNDO_EDITPAGESTYLE 379 +#define STR_UNDO_APPLYPAGESTYLE 377 +#define STR_UNDO_EDITCELLSTYLE 378 +#define STR_UNDO_EDITPAGESTYLE 379 -#define STR_DATAPILOT_SUBTOTAL 380 +#define STR_DATAPILOT_SUBTOTAL 380 -#define STR_UNDO_TRANSLITERATE 381 +#define STR_UNDO_TRANSLITERATE 381 #define STR_NO_ADDIN 382 #define STR_LONG_ERR_NO_ADDIN 383 @@ -565,14 +565,14 @@ #define STR_UNKNOWN_USER 429 #define STR_LONG_ERR_NULL 430 -#define STR_UNDO_INSERTNOTE 431 -#define STR_UNDO_DELETENOTE 432 +#define STR_UNDO_INSERTNOTE 431 +#define STR_UNDO_DELETENOTE 432 #define STR_STYLE_FAMILY_CELL 433 #define STR_STYLE_FAMILY_PAGE 434 -#define STR_ERR_DATAPILOTSOURCE 435 +#define STR_ERR_DATAPILOTSOURCE 435 #define STR_PIVOT_FIRSTROWEMPTYERR 436 -#define STR_PIVOT_ONLYONEROWERR 437 +#define STR_PIVOT_ONLYONEROWERR 437 #define STR_UNDO_SET_TAB_BG_COLOR 438 #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439 diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index fca3d184a4a2..5ff21e891118 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -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 @@ -36,9 +36,9 @@ class ScPaintHint : public SfxHint { - ScRange aRange; - USHORT nParts; - BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist + ScRange aRange; + USHORT nParts; + BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist ScPaintHint(); // disabled @@ -47,9 +47,9 @@ public: ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL ); ~ScPaintHint(); - void SetPrintFlag(BOOL bSet) { bPrint = bSet; } + void SetPrintFlag(BOOL bSet) { bPrint = bSet; } - const ScRange& GetRange() const { return aRange; } + const ScRange& GetRange() const { return aRange; } SCCOL GetStartCol() const { return aRange.aStart.Col(); } SCROW GetStartRow() const { return aRange.aStart.Row(); } SCTAB GetStartTab() const { return aRange.aStart.Tab(); } @@ -57,17 +57,17 @@ public: SCROW GetEndRow() const { return aRange.aEnd.Row(); } SCTAB GetEndTab() const { return aRange.aEnd.Tab(); } USHORT GetParts() const { return nParts; } - BOOL GetPrintFlag() const { return bPrint; } + BOOL GetPrintFlag() const { return bPrint; } }; class ScUpdateRefHint : public SfxHint { - UpdateRefMode eUpdateRefMode; - ScRange aRange; - SCsCOL nDx; - SCsROW nDy; - SCsTAB nDz; + UpdateRefMode eUpdateRefMode; + ScRange aRange; + SCsCOL nDx; + SCsROW nDy; + SCsTAB nDz; public: TYPEINFO(); @@ -76,19 +76,19 @@ public: SCsCOL nX, SCsROW nY, SCsTAB nZ ); ~ScUpdateRefHint(); - UpdateRefMode GetMode() const { return eUpdateRefMode; } - const ScRange& GetRange() const { return aRange; } - SCsCOL GetDx() const { return nDx; } - SCsROW GetDy() const { return nDy; } - SCsTAB GetDz() const { return nDz; } + UpdateRefMode GetMode() const { return eUpdateRefMode; } + const ScRange& GetRange() const { return aRange; } + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } + SCsTAB GetDz() const { return nDz; } }; -#define SC_POINTERCHANGED_NUMFMT 1 +#define SC_POINTERCHANGED_NUMFMT 1 class ScPointerChangedHint : public SfxHint { - USHORT nFlags; + USHORT nFlags; public: TYPEINFO(); @@ -96,55 +96,55 @@ public: //UNUSED2008-05 ScPointerChangedHint( USHORT nF ); ~ScPointerChangedHint(); - USHORT GetFlags() const { return nFlags; } + USHORT GetFlags() const { return nFlags; } }; -//! move ScLinkRefreshedHint to a different file? +//! move ScLinkRefreshedHint to a different file? -#define SC_LINKREFTYPE_NONE 0 -#define SC_LINKREFTYPE_SHEET 1 -#define SC_LINKREFTYPE_AREA 2 -#define SC_LINKREFTYPE_DDE 3 +#define SC_LINKREFTYPE_NONE 0 +#define SC_LINKREFTYPE_SHEET 1 +#define SC_LINKREFTYPE_AREA 2 +#define SC_LINKREFTYPE_DDE 3 class ScLinkRefreshedHint : public SfxHint { - USHORT nLinkType; // SC_LINKREFTYPE_... - String aUrl; // used for sheet links - String aDdeAppl; // used for dde links: - String aDdeTopic; - String aDdeItem; - BYTE nDdeMode; - ScAddress aDestPos; // used to identify area links - //! also use source data for area links? + USHORT nLinkType; // SC_LINKREFTYPE_... + String aUrl; // used for sheet links + String aDdeAppl; // used for dde links: + String aDdeTopic; + String aDdeItem; + BYTE nDdeMode; + ScAddress aDestPos; // used to identify area links + //! also use source data for area links? public: TYPEINFO(); ScLinkRefreshedHint(); ~ScLinkRefreshedHint(); - void SetSheetLink( const String& rSourceUrl ); - void SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM ); - void SetAreaLink( const ScAddress& rPos ); - - USHORT GetLinkType() const { return nLinkType; } - const String& GetUrl() const { return aUrl; } - const String& GetDdeAppl() const { return aDdeAppl; } - const String& GetDdeTopic() const { return aDdeTopic; } - const String& GetDdeItem() const { return aDdeItem; } - BYTE GetDdeMode() const { return nDdeMode; } - const ScAddress& GetDestPos() const { return aDestPos; } + void SetSheetLink( const String& rSourceUrl ); + void SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM ); + void SetAreaLink( const ScAddress& rPos ); + + USHORT GetLinkType() const { return nLinkType; } + const String& GetUrl() const { return aUrl; } + const String& GetDdeAppl() const { return aDdeAppl; } + const String& GetDdeTopic() const { return aDdeTopic; } + const String& GetDdeItem() const { return aDdeItem; } + BYTE GetDdeMode() const { return nDdeMode; } + const ScAddress& GetDestPos() const { return aDestPos; } }; -//! move ScAutoStyleHint to a different file? +//! move ScAutoStyleHint to a different file? class ScAutoStyleHint : public SfxHint { - ScRange aRange; - String aStyle1; - String aStyle2; - ULONG nTimeout; + ScRange aRange; + String aStyle1; + String aStyle2; + ULONG nTimeout; public: TYPEINFO(); @@ -152,10 +152,10 @@ public: ULONG nT, const String& rSt2 ); ~ScAutoStyleHint(); - const ScRange& GetRange() const { return aRange; } - const String& GetStyle1() const { return aStyle1; } - UINT32 GetTimeout() const { return nTimeout; } - const String& GetStyle2() const { return aStyle2; } + const ScRange& GetRange() const { return aRange; } + const String& GetStyle1() const { return aStyle1; } + UINT32 GetTimeout() const { return nTimeout; } + const String& GetStyle2() const { return aStyle2; } }; class ScDBRangeRefreshedHint : public SfxHint @@ -167,7 +167,7 @@ public: ScDBRangeRefreshedHint( const ScImportParam& rP ); ~ScDBRangeRefreshedHint(); - const ScImportParam& GetImportParam() const { return aParam; } + const ScImportParam& GetImportParam() const { return aParam; } }; class ScDataPilotModifiedHint : public SfxHint diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 62e258b76500..afd25a9fa0da 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -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 @@ -38,15 +38,15 @@ class SvStream; class ScInputOptions { private: - USHORT nMoveDir; // enum ScDirection - BOOL bMoveSelection; - BOOL bEnterEdit; - BOOL bExtendFormat; - BOOL bRangeFinder; - BOOL bExpandRefs; - BOOL bMarkHeader; - BOOL bUseTabCol; - BOOL bTextWysiwyg; + USHORT nMoveDir; // enum ScDirection + BOOL bMoveSelection; + BOOL bEnterEdit; + BOOL bExtendFormat; + BOOL bRangeFinder; + BOOL bExpandRefs; + BOOL bMarkHeader; + BOOL bUseTabCol; + BOOL bTextWysiwyg; BOOL bReplCellsWarn; public: @@ -54,7 +54,7 @@ public: ScInputOptions( const ScInputOptions& rCpy ); ~ScInputOptions(); - void SetDefaults(); + void SetDefaults(); void SetMoveDir(USHORT nNew) { nMoveDir = nNew; } USHORT GetMoveDir() const { return nMoveDir; } @@ -77,7 +77,7 @@ public: void SetReplaceCellsWarn(BOOL bSet) { bReplCellsWarn = bSet; } BOOL GetReplaceCellsWarn() const { return bReplCellsWarn; } - const ScInputOptions& operator= ( const ScInputOptions& rOpt ); + const ScInputOptions& operator= ( const ScInputOptions& rOpt ); }; @@ -93,11 +93,11 @@ class ScInputCfg : public ScInputOptions, public: ScInputCfg(); - void SetOptions( const ScInputOptions& rNew ); - void OptionsChanged(); // after direct access to SetOptions base class + void SetOptions( const ScInputOptions& rNew ); + void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Commit(); }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 284d851a45da..e329c37885fe 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -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 @@ -73,32 +73,32 @@ class ScSheetLinkObj : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - String aFileName; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + String aFileName; XRefreshListenerArr_Impl aRefreshListeners; - ScTableLink* GetLink_Impl() const; - void Refreshed_Impl(); - void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); + ScTableLink* GetLink_Impl() const; + void Refreshed_Impl(); + void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); public: ScSheetLinkObj(ScDocShell* pDocSh, const String& rName); - virtual ~ScSheetLinkObj(); + virtual ~ScSheetLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -106,7 +106,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -118,25 +118,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -144,14 +144,14 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; - void setRefreshDelay(sal_Int32 nRefreshDelay); + ::rtl::OUString getFileName(void) const; + void setFileName(const ::rtl::OUString& FileName); + ::rtl::OUString getFilter(void) const; + void setFilter(const ::rtl::OUString& Filter); + ::rtl::OUString getFilterOptions(void) const; + void setFilterOptions(const ::rtl::OUString& FilterOptions); + sal_Int32 getRefreshDelay(void) const; + void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() @@ -171,16 +171,16 @@ class ScSheetLinksObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScSheetLinkObj* GetObjectByIndex_Impl(INT32 nIndex); - ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScSheetLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScSheetLinksObj(ScDocShell* pDocSh); - virtual ~ScSheetLinksObj(); + virtual ~ScSheetLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -226,29 +226,29 @@ class ScAreaLinkObj : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - USHORT nPos; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + USHORT nPos; XRefreshListenerArr_Impl aRefreshListeners; - void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, + void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, const ::rtl::OUString* pNewOptions, const ::rtl::OUString* pNewSource, const com::sun::star::table::CellRangeAddress* pNewDest ); - void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); - void Refreshed_Impl(); + void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); + void Refreshed_Impl(); public: ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP); - virtual ~ScAreaLinkObj(); + virtual ~ScAreaLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -256,7 +256,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -268,25 +268,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -294,18 +294,18 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; - void setRefreshDelay(sal_Int32 nRefreshDelay); + ::rtl::OUString getFileName(void) const; + void setFileName(const ::rtl::OUString& FileName); + ::rtl::OUString getFilter(void) const; + void setFilter(const ::rtl::OUString& Filter); + ::rtl::OUString getFilterOptions(void) const; + void setFilterOptions(const ::rtl::OUString& FilterOptions); + sal_Int32 getRefreshDelay(void) const; + void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink virtual ::rtl::OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) + virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() throw(::com::sun::star::uno::RuntimeException); @@ -329,24 +329,24 @@ class ScAreaLinksObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScAreaLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScAreaLinkObj* GetObjectByIndex_Impl(INT32 nIndex); public: ScAreaLinksObj(ScDocShell* pDocSh); - virtual ~ScAreaLinksObj(); + virtual ~ScAreaLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XAreaLinks - virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, + virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, const ::rtl::OUString& aFileName, const ::rtl::OUString& aSourceArea, const ::rtl::OUString& aFilter, const ::rtl::OUString& aFilterOptions ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -375,7 +375,7 @@ public: }; -//! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols +//! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols class ScDDELinkObj : public cppu::WeakImplHelper5< com::sun::star::sheet::XDDELink, @@ -386,24 +386,24 @@ class ScDDELinkObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - String aAppl; - String aTopic; - String aItem; + ScDocShell* pDocShell; + String aAppl; + String aTopic; + String aItem; XRefreshListenerArr_Impl aRefreshListeners; - void Refreshed_Impl(); + void Refreshed_Impl(); public: ScDDELinkObj(ScDocShell* pDocSh, const String& rA, const String& rT, const String& rI); - virtual ~ScDDELinkObj(); + virtual ~ScDDELinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDDELink @@ -412,11 +412,11 @@ public: virtual ::rtl::OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -446,16 +446,16 @@ class ScDDELinksObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScDDELinkObj* GetObjectByIndex_Impl(INT32 nIndex); - ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDDELinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDDELinksObj(ScDocShell* pDocSh); - virtual ~ScDDELinksObj(); + virtual ~ScDDELinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx index 988cd2a24dd7..3de367ac15af 100644 --- a/sc/inc/listenercalls.hxx +++ b/sc/inc/listenercalls.hxx @@ -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/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 431f995d27c2..7028c9f38e5b 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -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/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 78bb2a6bba3d..d21d7943408a 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -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 @@ -35,50 +35,50 @@ struct ScMarkEntry { - SCROW nRow; - BOOL bMarked; + SCROW nRow; + BOOL bMarked; }; class ScMarkArray { - SCSIZE nCount; + SCSIZE nCount; SCSIZE nLimit; - ScMarkEntry* pData; + ScMarkEntry* pData; friend class ScMarkArrayIter; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo public: ScMarkArray(); ~ScMarkArray(); - void Reset( BOOL bMarked = FALSE ); - BOOL GetMark( SCROW nRow ) const; - void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); - BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; - BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; + void Reset( BOOL bMarked = FALSE ); + BOOL GetMark( SCROW nRow ) const; + void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); + BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; + BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; - BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } + BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } - void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; + void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; -//UNUSED2009-05 void DeleteArea(SCROW nStartRow, SCROW nEndRow); + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; +//UNUSED2009-05 void DeleteArea(SCROW nStartRow, SCROW nEndRow); /// Including current row, may return -1 if bUp and not found - SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; - SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; + SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; }; -class ScMarkArrayIter // selektierte Bereiche durchgehen +class ScMarkArrayIter // selektierte Bereiche durchgehen { - const ScMarkArray* pArray; - SCSIZE nPos; + const ScMarkArray* pArray; + SCSIZE nPos; public: ScMarkArrayIter( const ScMarkArray* pNewArray ); ~ScMarkArrayIter(); - BOOL Next( SCROW& rTop, SCROW& rBottom ); + BOOL Next( SCROW& rTop, SCROW& rBottom ); }; diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index a982c8db47dd..984d9d527b6e 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -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 @@ -35,83 +35,83 @@ class ScMarkArray; class ScRangeList; -//! todo: -//! Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten, -//! damit "alle suchen" ueber mehrere Tabellen wieder funktioniert! +//! todo: +//! Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten, +//! damit "alle suchen" ueber mehrere Tabellen wieder funktioniert! class SC_DLLPUBLIC ScMarkData { private: - ScRange aMarkRange; // Bereich - ScRange aMultiRange; // maximaler Bereich insgesamt - ScMarkArray* pMultiSel; // Mehrfachselektion - BOOL bTabMarked[MAXTABCOUNT];// Tabelle selektiert - BOOL bMarked; // Rechteck markiert - BOOL bMultiMarked; // mehrfach markiert + ScRange aMarkRange; // Bereich + ScRange aMultiRange; // maximaler Bereich insgesamt + ScMarkArray* pMultiSel; // Mehrfachselektion + BOOL bTabMarked[MAXTABCOUNT];// Tabelle selektiert + BOOL bMarked; // Rechteck markiert + BOOL bMultiMarked; // mehrfach markiert - BOOL bMarking; // Bereich wird aufgezogen -> kein MarkToMulti - BOOL bMarkIsNeg; // Aufheben bei Mehrfachselektion + BOOL bMarking; // Bereich wird aufgezogen -> kein MarkToMulti + BOOL bMarkIsNeg; // Aufheben bei Mehrfachselektion public: ScMarkData(); ScMarkData(const ScMarkData& rData); ~ScMarkData(); - ScMarkData& operator=(const ScMarkData& rData); + ScMarkData& operator=(const ScMarkData& rData); - void ResetMark(); - void SetMarkArea( const ScRange& rRange ); + void ResetMark(); + void SetMarkArea( const ScRange& rRange ); - void SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE ); + void SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE ); - void MarkToMulti(); - void MarkToSimple(); + void MarkToMulti(); + void MarkToSimple(); - BOOL IsMarked() const { return bMarked; } - BOOL IsMultiMarked() const { return bMultiMarked; } + BOOL IsMarked() const { return bMarked; } + BOOL IsMultiMarked() const { return bMultiMarked; } - void GetMarkArea( ScRange& rRange ) const; - void GetMultiMarkArea( ScRange& rRange ) const; + void GetMarkArea( ScRange& rRange ) const; + void GetMultiMarkArea( ScRange& rRange ) const; - void SetAreaTab( SCTAB nTab ); + void SetAreaTab( SCTAB nTab ); - void SelectTable( SCTAB nTab, BOOL bNew ) { bTabMarked[nTab] = bNew; } - BOOL GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } + void SelectTable( SCTAB nTab, BOOL bNew ) { bTabMarked[nTab] = bNew; } + BOOL GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } - void SelectOneTable( SCTAB nTab ); - SCTAB GetSelectCount() const; - SCTAB GetFirstSelected() const; + void SelectOneTable( SCTAB nTab ); + SCTAB GetSelectCount() const; + SCTAB GetFirstSelected() const; - void SetMarkNegative( BOOL bFlag ) { bMarkIsNeg = bFlag; } - BOOL IsMarkNegative() const { return bMarkIsNeg; } - void SetMarking( BOOL bFlag ) { bMarking = bFlag; } - BOOL GetMarkingFlag() const { return bMarking; } + void SetMarkNegative( BOOL bFlag ) { bMarkIsNeg = bFlag; } + BOOL IsMarkNegative() const { return bMarkIsNeg; } + void SetMarking( BOOL bFlag ) { bMarking = bFlag; } + BOOL GetMarkingFlag() const { return bMarking; } - // fuer FillInfo / Document etc. - const ScMarkArray* GetArray() const { return pMultiSel; } + // fuer FillInfo / Document etc. + const ScMarkArray* GetArray() const { return pMultiSel; } - BOOL IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const; - void FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const; - void ExtendRangeListTables( ScRangeList* pList ) const; + BOOL IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const; + void FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const; + void ExtendRangeListTables( ScRangeList* pList ) const; - void MarkFromRangeList( const ScRangeList& rList, BOOL bReset ); + void MarkFromRangeList( const ScRangeList& rList, BOOL bReset ); - SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges ); - SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges ); + SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges ); + SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges ); - BOOL IsColumnMarked( SCCOL nCol ) const; - BOOL IsRowMarked( SCROW nRow ) const; - BOOL IsAllMarked( const ScRange& rRange ) const; // Multi + BOOL IsColumnMarked( SCCOL nCol ) const; + BOOL IsRowMarked( SCROW nRow ) const; + BOOL IsAllMarked( const ScRange& rRange ) const; // Multi /// May return -1 - SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const; - BOOL HasMultiMarks( SCCOL nCol ) const; - BOOL HasAnyMultiMarks() const; + SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const; + BOOL HasMultiMarks( SCCOL nCol ) const; + BOOL HasAnyMultiMarks() const; - // Tabellen-Markierungen anpassen: - void InsertTab( SCTAB nTab ); - void DeleteTab( SCTAB nTab ); + // Tabellen-Markierungen anpassen: + void InsertTab( SCTAB nTab ); + void DeleteTab( SCTAB nTab ); }; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index d1958eccceac..911fbb034912 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -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 @@ -37,59 +37,59 @@ #include #include "scdllapi.h" -#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ -::rtl::OUString SAL_CALL ClassName::getImplementationName() \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - return ::rtl::OUString::createFromAscii(ClassNameAscii); \ -} \ +#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ +::rtl::OUString SAL_CALL ClassName::getImplementationName() \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + return ::rtl::OUString::createFromAscii(ClassNameAscii); \ +} \ sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - return !ServiceName.compareToAscii(ServiceAscii); \ -} \ -::com::sun::star::uno::Sequence< ::rtl::OUString > \ - SAL_CALL ClassName::getSupportedServiceNames(void) \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ - ::rtl::OUString* pArray = aRet.getArray(); \ - pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ - return aRet; \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + return !ServiceName.compareToAscii(ServiceAscii); \ +} \ +::com::sun::star::uno::Sequence< ::rtl::OUString > \ + SAL_CALL ClassName::getSupportedServiceNames(void) \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ + ::rtl::OUString* pArray = aRet.getArray(); \ + pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ + return aRet; \ } -#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ - void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ - const uno::Reference&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ - const uno::Reference&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ - const uno::Reference&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ - const uno::Reference&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ +#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ + void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ + const uno::Reference&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ + const uno::Reference&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ + const uno::Reference&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ + const uno::Reference&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ { DBG_ERROR("not implemented"); } -#define SC_QUERYINTERFACE(x) \ - if (rType == getCppuType((const uno::Reference*)0)) \ +#define SC_QUERYINTERFACE(x) \ + if (rType == getCppuType((const uno::Reference*)0)) \ { return uno::makeAny(uno::Reference(this)); } // SC_QUERY_MULTIPLE( XElementAccess, XIndexAccess ): -// use if interface is used several times in one class +// use if interface is used several times in one class -#define SC_QUERY_MULTIPLE(x,y) \ - if (rType == getCppuType((const uno::Reference*)0)) \ +#define SC_QUERY_MULTIPLE(x,y) \ + if (rType == getCppuType((const uno::Reference*)0)) \ { uno::Any aR; aR <<= uno::Reference(static_cast(this)); return aR; } @@ -100,12 +100,12 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2< private: com::sun::star::uno::Reference xIndex; rtl::OUString sServiceName; - sal_Int32 nPos; + sal_Int32 nPos; public: ScIndexEnumeration(const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess>& rInd, const rtl::OUString& rServiceName); - virtual ~ScIndexEnumeration(); + virtual ~ScIndexEnumeration(); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -130,16 +130,16 @@ public: //UNUSED2008-05 public: //UNUSED2008-05 ScEmptyEnumerationAccess(); //UNUSED2008-05 virtual ~ScEmptyEnumerationAccess(); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XEnumerationAccess //UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL //UNUSED2008-05 createEnumeration() throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XElementAccess //UNUSED2008-05 virtual ::com::sun::star::uno::Type SAL_CALL getElementType() //UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); //UNUSED2008-05 virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XServiceInfo //UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) //UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); @@ -156,14 +156,14 @@ public: //UNUSED2008-05 public: //UNUSED2008-05 ScEmptyEnumeration(); //UNUSED2008-05 virtual ~ScEmptyEnumeration(); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XEnumeration //UNUSED2008-05 virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); //UNUSED2008-05 virtual ::com::sun::star::uno::Any SAL_CALL nextElement() //UNUSED2008-05 throw(::com::sun::star::container::NoSuchElementException, //UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, //UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XServiceInfo //UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) //UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); @@ -173,7 +173,7 @@ public: //UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); //UNUSED2008-05 }; -// new (uno 3) variant +// new (uno 3) variant class ScNameToIndexAccess : public cppu::WeakImplHelper2< com::sun::star::container::XIndexAccess, com::sun::star::lang::XServiceInfo > @@ -186,7 +186,7 @@ public: ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ); - virtual ~ScNameToIndexAccess(); + virtual ~ScNameToIndexAccess(); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); @@ -216,7 +216,7 @@ public: //UNUSED2008-05 public: //UNUSED2008-05 ScPrintSettingsObj(); //UNUSED2008-05 virtual ~ScPrintSettingsObj(); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XPropertySet //UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > //UNUSED2008-05 SAL_CALL getPropertySetInfo() @@ -257,7 +257,7 @@ public: //UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, //UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, //UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 // XServiceInfo //UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) //UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); @@ -273,24 +273,24 @@ class SC_DLLPUBLIC ScUnoHelpFunctions public: static com::sun::star::uno::Reference AnyToInterface( const com::sun::star::uno::Any& rAny ); - static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< + static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, sal_Bool bDefault = sal_False ); - static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< + static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, long nDefault = 0 ); - static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< + static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, long nDefault ); static ::rtl::OUString GetStringProperty( const com::sun::star::uno::Reference& xProp, const ::rtl::OUString& rName, const ::rtl::OUString& rDefault ); - static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny ); - static void SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue ); + static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny ); + static void SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue ); static void SetOptionalPropertyValue( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, diff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxx index bd45332b9817..acf58dcee5bd 100644 --- a/sc/inc/mutexhlp.hxx +++ b/sc/inc/mutexhlp.hxx @@ -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 @@ -30,8 +30,8 @@ #include -// used in XComponent implementations to construct a Mutex before the -// OComponentHelper base class +// used in XComponent implementations to construct a Mutex before the +// OComponentHelper base class class ScMutexHelper { diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index b8cb1ad91754..60bc1f3e99ab 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -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 @@ -63,33 +63,33 @@ class ScNamedRangeObj : public ::cppu::WeakImplHelper6< public SfxListener { private: - ScDocShell* pDocShell; - String aName; + ScDocShell* pDocShell; + String aName; private: - ScRangeData* GetRangeData_Impl(); - void Modify_Impl( const String* pNewName, + ScRangeData* GetRangeData_Impl(); + void Modify_Impl( const String* pNewName, const ScTokenArray* pNewTokens, const String* pNewContent, const ScAddress* pNewPos, const sal_uInt16* pNewType, const formula::FormulaGrammar::Grammar eGrammar ); public: ScNamedRangeObj(ScDocShell* pDocSh, const String& rNm); - virtual ~ScNamedRangeObj(); + virtual ~ScNamedRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamedRange virtual ::rtl::OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) + virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReferencePosition( + virtual void SAL_CALL setReferencePosition( const ::com::sun::star::table::CellAddress& aReferencePosition ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); // XFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() @@ -100,7 +100,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XCellRangeReferrer @@ -111,7 +111,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -123,25 +123,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -181,10 +181,10 @@ class ScNamedRangesObj : public ::cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); + ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); protected: /** called from the XActionLockable interface methods on initial locking */ @@ -195,20 +195,20 @@ protected: public: ScNamedRangesObj(ScDocShell* pDocSh); - virtual ~ScNamedRangesObj(); + virtual ~ScNamedRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamedRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, + virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, ::com::sun::star::sheet::Border aBorder ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) + virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -260,28 +260,28 @@ class ScLabelRangeObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - sal_Bool bColumn; - ScRange aRange; // Kriterium um Bereich zu finden + ScDocShell* pDocShell; + sal_Bool bColumn; + ScRange aRange; // Kriterium um Bereich zu finden private: - ScRangePair* GetData_Impl(); - void Modify_Impl( const ScRange* pLabel, const ScRange* pData ); + ScRangePair* GetData_Impl(); + void Modify_Impl( const ScRange* pLabel, const ScRange* pData ); public: ScLabelRangeObj(ScDocShell* pDocSh, sal_Bool bCol, const ScRange& rR); - virtual ~ScLabelRangeObj(); + virtual ~ScLabelRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XLabelRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getLabelArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) + virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) + virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -301,22 +301,22 @@ class ScLabelRangesObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - sal_Bool bColumn; + ScDocShell* pDocShell; + sal_Bool bColumn; - ScLabelRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); + ScLabelRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); public: ScLabelRangesObj(ScDocShell* pDocSh, sal_Bool bCol); - virtual ~ScLabelRangesObj(); + virtual ~ScLabelRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XLabelRanges - virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, + virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx index 23cd38e1f10a..78a0f3d686d3 100644 --- a/sc/inc/navicfg.hxx +++ b/sc/inc/navicfg.hxx @@ -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 @@ -38,19 +38,19 @@ class ScNavipiCfg { private: - USHORT nListMode; - USHORT nDragMode; - USHORT nRootType; + USHORT nListMode; + USHORT nDragMode; + USHORT nRootType; public: ScNavipiCfg(); - void SetListMode(USHORT nNew); - USHORT GetListMode() const { return nListMode; } - void SetDragMode(USHORT nNew); - USHORT GetDragMode() const { return nDragMode; } - void SetRootType(USHORT nNew); - USHORT GetRootType() const { return nRootType; } + void SetListMode(USHORT nNew); + USHORT GetListMode() const { return nListMode; } + void SetDragMode(USHORT nNew); + USHORT GetDragMode() const { return nDragMode; } + void SetRootType(USHORT nNew); + USHORT GetRootType() const { return nRootType; } }; diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index a1648132f8e1..87ac2f348db2 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -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,14 +56,14 @@ class ScAnnotationObj : public cppu::WeakImplHelper5< { public: ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScAnnotationObj(); + virtual ~ScAnnotationObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); @@ -75,11 +75,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -93,7 +93,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XSheetAnnotation @@ -124,9 +124,9 @@ private: const ScPostIt* ImplGetNote() const; private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxUnoText* pUnoText; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxUnoText* pUnoText; }; class ScAnnotationShapeObj : public cppu::WeakImplHelper10< @@ -143,25 +143,25 @@ class ScAnnotationShapeObj : public cppu::WeakImplHelper10< public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxUnoText* pUnoText; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxUnoText* pUnoText; com::sun::star::uno::Reference < com::sun::star::drawing::XShape > xShape; private: - SvxUnoText& GetUnoText(); + SvxUnoText& GetUnoText(); com::sun::star::uno::Reference < com::sun::star::drawing::XShape > GetXShape(); public: ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScAnnotationShapeObj(); + virtual ~ScAnnotationShapeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); @@ -200,11 +200,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -218,94 +218,94 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) + throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + throw (::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< + ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) + throw (::com::sun::star::uno::RuntimeException); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 82a49b3ba025..bf21b739f41f 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -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/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index 094ff1cfea32..2daa67421859 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -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 @@ -51,30 +51,30 @@ public: static const SfxItemPropertyMapEntry* GetPropertyMap(); static sal_Bool setPropertyValue( ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const SfxItemPropertyMap& rPropMap, const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); static ::com::sun::star::uno::Any getPropertyValue( const ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const SfxItemPropertyMap& rPropMap, const ::rtl::OUString& PropertyName ); }; -// empty doc object to supply only doc options +// empty doc object to supply only doc options class ScDocOptionsObj : public ScModelObj { private: - ScDocOptions aOptions; + ScDocOptions aOptions; public: ScDocOptionsObj( const ScDocOptions& rOpt ); - virtual ~ScDocOptionsObj(); + virtual ~ScDocOptionsObj(); // get/setPropertyValue overloaded to used stored options instead of document - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 83b23a3c9ef9..708db82ba085 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -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 @@ -36,25 +36,25 @@ class ScOptionsUtil { public: - static BOOL IsMetricSystem(); + static BOOL IsMetricSystem(); }; -// ConfigItem for classes that use items from several sub trees +// ConfigItem for classes that use items from several sub trees class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem { - Link aCommitLink; + Link aCommitLink; public: ScLinkConfigItem( const rtl::OUString& rSubTree ); ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ); - void SetCommitLink( const Link& rLink ); + void SetCommitLink( const Link& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Commit(); - void SetModified() { ConfigItem::SetModified(); } + void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } @@ -65,11 +65,11 @@ public: using ConfigItem::EnableNotification; using ConfigItem::GetNodeNames; -// sal_Bool EnableNotification(com::sun::star::uno::Sequence< rtl::OUString >& rNames) -// { return ConfigItem::EnableNotification( rNames ); } +// sal_Bool EnableNotification(com::sun::star::uno::Sequence< rtl::OUString >& rNames) +// { return ConfigItem::EnableNotification( rNames ); } -// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) -// { return ConfigItem::GetNodeNames( rNode ); } +// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) +// { return ConfigItem::GetNodeNames( rNode ); } }; #endif diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index 935046e81a48..1b094cdc084f 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -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 @@ -35,49 +35,49 @@ struct ScPageTableParam { - BOOL bCellContent; - BOOL bNotes; - BOOL bGrid; - BOOL bHeaders; - BOOL bCharts; - BOOL bObjects; - BOOL bDrawings; - BOOL bFormulas; - BOOL bNullVals; - BOOL bTopDown; - BOOL bLeftRight; - BOOL bSkipEmpty; - BOOL bScaleNone; - BOOL bScaleAll; + BOOL bCellContent; + BOOL bNotes; + BOOL bGrid; + BOOL bHeaders; + BOOL bCharts; + BOOL bObjects; + BOOL bDrawings; + BOOL bFormulas; + BOOL bNullVals; + BOOL bTopDown; + BOOL bLeftRight; + BOOL bSkipEmpty; + BOOL bScaleNone; + BOOL bScaleAll; BOOL bScaleTo; - BOOL bScalePageNum; - USHORT nScaleAll; + BOOL bScalePageNum; + USHORT nScaleAll; USHORT nScaleWidth; USHORT nScaleHeight; - USHORT nScalePageNum; - USHORT nFirstPageNo; + USHORT nScalePageNum; + USHORT nFirstPageNo; ScPageTableParam(); ~ScPageTableParam(); - BOOL operator== ( const ScPageTableParam& r ) const; - void Reset (); + BOOL operator== ( const ScPageTableParam& r ) const; + void Reset (); }; struct ScPageAreaParam { - BOOL bPrintArea; - BOOL bRepeatRow; - BOOL bRepeatCol; - ScRange aPrintArea; - ScRange aRepeatRow; - ScRange aRepeatCol; + BOOL bPrintArea; + BOOL bRepeatRow; + BOOL bRepeatCol; + ScRange aPrintArea; + ScRange aRepeatRow; + ScRange aRepeatCol; ScPageAreaParam(); ~ScPageAreaParam(); - BOOL operator== ( const ScPageAreaParam& r ) const; - void Reset (); + BOOL operator== ( const ScPageAreaParam& r ) const; + void Reset (); }; diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 4b897748db1e..a054d9922c67 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -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,7 +32,7 @@ //------------------------------------------------------------------------ -// SvxFmDrawPage subclass to create ScShapeObj for shapes +// SvxFmDrawPage subclass to create ScShapeObj for shapes class ScPageObj : public SvxFmDrawPage { diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx index 896fec2e88d9..a2340087c9e0 100644 --- a/sc/inc/paramisc.hxx +++ b/sc/inc/paramisc.hxx @@ -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 @@ -35,30 +35,30 @@ class String; struct ScSolveParam { - ScAddress aRefFormulaCell; - ScAddress aRefVariableCell; - String* pStrTargetVal; + ScAddress aRefFormulaCell; + ScAddress aRefVariableCell; + String* pStrTargetVal; ScSolveParam(); ScSolveParam( const ScSolveParam& r ); - ScSolveParam( const ScAddress& rFormulaCell, - const ScAddress& rVariableCell, + ScSolveParam( const ScAddress& rFormulaCell, + const ScAddress& rVariableCell, const String& rTargetValStr ); ~ScSolveParam(); - ScSolveParam& operator= ( const ScSolveParam& r ); - BOOL operator== ( const ScSolveParam& r ) const; + ScSolveParam& operator= ( const ScSolveParam& r ); + BOOL operator== ( const ScSolveParam& r ) const; }; //----------------------------------------------------------------------- struct ScTabOpParam { - ScRefAddress aRefFormulaCell; - ScRefAddress aRefFormulaEnd; - ScRefAddress aRefRowCell; - ScRefAddress aRefColCell; - BYTE nMode; + ScRefAddress aRefFormulaCell; + ScRefAddress aRefFormulaEnd; + ScRefAddress aRefRowCell; + ScRefAddress aRefColCell; + BYTE nMode; ScTabOpParam() {}; ScTabOpParam( const ScTabOpParam& r ); @@ -66,11 +66,11 @@ struct ScTabOpParam const ScRefAddress& rFormulaEnd, const ScRefAddress& rRowCell, const ScRefAddress& rColCell, - BYTE nMd); + BYTE nMd); ~ScTabOpParam() {}; - ScTabOpParam& operator= ( const ScTabOpParam& r ); - BOOL operator== ( const ScTabOpParam& r ) const; + ScTabOpParam& operator= ( const ScTabOpParam& r ); + BOOL operator== ( const ScTabOpParam& r ) const; }; #endif // SC_PARAMISC_HXX diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index b8929a450576..84bb51d58126 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -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 @@ -42,24 +42,24 @@ class SvNumberFormatter; class ScDocument; -// how to treat COL_AUTO in GetFont: +// how to treat COL_AUTO in GetFont: enum ScAutoFontColorMode { - SC_AUTOCOL_RAW, // COL_AUTO is returned - SC_AUTOCOL_BLACK, // always use black - SC_AUTOCOL_PRINT, // black or white, depending on background - SC_AUTOCOL_DISPLAY, // from style settings, or black/white if needed - SC_AUTOCOL_IGNOREFONT, // like DISPLAY, but ignore stored font color (assume COL_AUTO) - SC_AUTOCOL_IGNOREBACK, // like DISPLAY, but ignore stored background color (use configured color) - SC_AUTOCOL_IGNOREALL // like DISPLAY, but ignore stored font and background colors + SC_AUTOCOL_RAW, // COL_AUTO is returned + SC_AUTOCOL_BLACK, // always use black + SC_AUTOCOL_PRINT, // black or white, depending on background + SC_AUTOCOL_DISPLAY, // from style settings, or black/white if needed + SC_AUTOCOL_IGNOREFONT, // like DISPLAY, but ignore stored font color (assume COL_AUTO) + SC_AUTOCOL_IGNOREBACK, // like DISPLAY, but ignore stored background color (use configured color) + SC_AUTOCOL_IGNOREALL // like DISPLAY, but ignore stored font and background colors }; class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem { - String* pName; - ScStyleSheet* pStyle; + String* pName; + ScStyleSheet* pStyle; public: static ScDocument* pDoc; ScPatternAttr(SfxItemSet* pItemSet, const String& rStyleName); @@ -73,17 +73,17 @@ public: virtual SfxPoolItem* Create(SvStream& rStream, USHORT nVersion) const; virtual SvStream& Store(SvStream& rStream, USHORT nItemVersion) const; - virtual int operator==(const SfxPoolItem& rCmp) const; + virtual int operator==(const SfxPoolItem& rCmp) const; const SfxPoolItem& GetItem( USHORT nWhichP ) const { return GetItemSet().Get(nWhichP); } static const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet ); - const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const; + const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const; // pWhich sind keine Ranges, sondern einzelne IDs, 0-terminiert - BOOL HasItemsSet( const USHORT* pWhich ) const; - void ClearItems( const USHORT* pWhich ); + BOOL HasItemsSet( const USHORT* pWhich ) const; + void ClearItems( const USHORT* pWhich ); void DeleteUnchanged( const ScPatternAttr* pOldAttrs ); @@ -116,29 +116,29 @@ public: /** Converts all edit engine items contained in pEditSet to Calc items and puts them into the own item set. */ void GetFromEditItemSet( const SfxItemSet* pEditSet ); - void FillEditParaItems( SfxItemSet* pSet ) const; + void FillEditParaItems( SfxItemSet* pSet ) const; ScPatternAttr* PutInPool( ScDocument* pDestDoc, ScDocument* pSrcDoc ) const; - void SetStyleSheet(ScStyleSheet* pNewStyle); - const ScStyleSheet* GetStyleSheet() const { return pStyle; } - const String* GetStyleName() const; - void UpdateStyleSheet(); - void StyleToName(); + void SetStyleSheet(ScStyleSheet* pNewStyle); + const ScStyleSheet* GetStyleSheet() const { return pStyle; } + const String* GetStyleName() const; + void UpdateStyleSheet(); + void StyleToName(); - BOOL IsVisible() const; - BOOL IsVisibleEqual( const ScPatternAttr& rOther ) const; + BOOL IsVisible() const; + BOOL IsVisibleEqual( const ScPatternAttr& rOther ) const; /** If font is an old symbol font StarBats/StarMath with text encoding RTL_TEXTENC_SYMBOL */ - BOOL IsSymbolFont() const; + BOOL IsSymbolFont() const; //UNUSED2008-05 /** Create a FontToSubsFontConverter if needed for //UNUSED2008-05 this pattern, else return 0. -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 @param nFlags is the bit mask which shall be //UNUSED2008-05 used for CreateFontToSubsFontConverter(). -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 The converter must be destroyed by the caller //UNUSED2008-05 using DestroyFontToSubsFontConverter() which //UNUSED2008-05 should be accomplished using the @@ -146,12 +146,12 @@ public: //UNUSED2008-05 */ //UNUSED2008-05 FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const; - ULONG GetNumberFormat( SvNumberFormatter* ) const; - ULONG GetNumberFormat( SvNumberFormatter* pFormatter, + ULONG GetNumberFormat( SvNumberFormatter* ) const; + ULONG GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const; - long GetRotateVal( const SfxItemSet* pCondSet ) const; - BYTE GetRotateDir( const SfxItemSet* pCondSet ) const; + long GetRotateVal( const SfxItemSet* pCondSet ) const; + BYTE GetRotateDir( const SfxItemSet* pCondSet ) const; }; diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxx index 6d7b708ffd69..4fbe05456e1c 100755 --- a/sc/inc/pch/precompiled_sc.cxx +++ b/sc/inc/pch/precompiled_sc.cxx @@ -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/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 048d7b638d57..0b69bf5f7674 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -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/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 915a311411c4..118b02752eae 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -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,8 +56,8 @@ class SubTotal; #include "collect.hxx" -#define PIVOT_DATA_FIELD (MAXCOLCOUNT) -#define PIVOT_FUNC_REF (MAXCOLCOUNT) +#define PIVOT_DATA_FIELD (MAXCOLCOUNT) +#define PIVOT_FUNC_REF (MAXCOLCOUNT) #include #include #include @@ -129,7 +129,7 @@ struct ScPivotParam // ----------------------------------------------------------------------- -typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; +typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; typedef PivotField PivotPageFieldArr[PIVOT_MAXPAGEFIELD]; //------------------------------------------------------------------------ @@ -153,11 +153,11 @@ struct ScDPLabelData Member(); - /** - * return the name that should be displayed in the dp dialogs i.e. - * when the layout name is present, use it, or else use the original - * name. - */ + /** + * return the name that should be displayed in the dp dialogs i.e. + * when the layout name is present, use it, or else use the original + * name. + */ ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; }; ::std::vector maMembers; @@ -168,10 +168,10 @@ struct ScDPLabelData explicit ScDPLabelData( const String& rName, short nCol, bool bIsValue ); - /** - * return the name that should be displayed in the dp dialogs i.e. when + /** + * return the name that should be displayed in the dp dialogs i.e. when * the layout name is present, use it, or else use the original name. - */ + */ ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; }; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index a4363e3adfbc..158312640433 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -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/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ec063d2d0e9b..d7358f8c3237 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -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 @@ -35,24 +35,24 @@ class SC_DLLPUBLIC ScPrintOptions { private: - BOOL bSkipEmpty; - BOOL bAllSheets; + BOOL bSkipEmpty; + BOOL bAllSheets; public: ScPrintOptions(); ScPrintOptions( const ScPrintOptions& rCpy ); ~ScPrintOptions(); - BOOL GetSkipEmpty() const { return bSkipEmpty; } - void SetSkipEmpty( BOOL bVal ) { bSkipEmpty = bVal; } - BOOL GetAllSheets() const { return bAllSheets; } - void SetAllSheets( BOOL bVal ) { bAllSheets = bVal; } + BOOL GetSkipEmpty() const { return bSkipEmpty; } + void SetSkipEmpty( BOOL bVal ) { bSkipEmpty = bVal; } + BOOL GetAllSheets() const { return bAllSheets; } + void SetAllSheets( BOOL bVal ) { bAllSheets = bVal; } - void SetDefaults(); + void SetDefaults(); - const ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); - int operator== ( const ScPrintOptions& rOpt ) const; - int operator!= ( const ScPrintOptions& rOpt ) const; + const ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); + int operator== ( const ScPrintOptions& rOpt ) const; + int operator!= ( const ScPrintOptions& rOpt ) const; }; //================================================================== @@ -73,7 +73,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScPrintOptions& GetPrintOptions() const { return theOptions; } + const ScPrintOptions& GetPrintOptions() const { return theOptions; } private: ScPrintOptions theOptions; @@ -90,9 +90,9 @@ class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem public: ScPrintCfg(); - void SetOptions( const ScPrintOptions& rNew ); + void SetOptions( const ScPrintOptions& rNew ); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx index b28d04cf48bf..9640b4261315 100644 --- a/sc/inc/prnsave.hxx +++ b/sc/inc/prnsave.hxx @@ -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,23 +56,23 @@ public: const ScRange* GetRepeatCol() const { return mpRepeatCol; } const ScRange* GetRepeatRow() const { return mpRepeatRow; } - BOOL operator==( const ScPrintSaverTab& rCmp ) const; + BOOL operator==( const ScPrintSaverTab& rCmp ) const; }; class ScPrintRangeSaver { - SCTAB nTabCount; - ScPrintSaverTab* pData; // Array + SCTAB nTabCount; + ScPrintSaverTab* pData; // Array public: ScPrintRangeSaver( SCTAB nCount ); ~ScPrintRangeSaver(); - SCTAB GetTabCount() const { return nTabCount; } - ScPrintSaverTab& GetTabData(SCTAB nTab); - const ScPrintSaverTab& GetTabData(SCTAB nTab) const; + SCTAB GetTabCount() const { return nTabCount; } + ScPrintSaverTab& GetTabData(SCTAB nTab); + const ScPrintSaverTab& GetTabData(SCTAB nTab) const; - BOOL operator==( const ScPrintRangeSaver& rCmp ) const; + BOOL operator==( const ScPrintRangeSaver& rCmp ) const; }; diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index a9cd3d2544bd..f724583c66ed 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -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 @@ -47,39 +47,39 @@ class ScDocument; class SC_DLLPUBLIC ScProgress { private: - static SfxProgress* pGlobalProgress; - static ULONG nGlobalRange; - static ULONG nGlobalPercent; - static BOOL bGlobalNoUserBreak; - static ScProgress* pInterpretProgress; - static ScProgress* pOldInterpretProgress; - static ULONG nInterpretProgress; - static BOOL bAllowInterpretProgress; - static ScDocument* pInterpretDoc; - static BOOL bIdleWasDisabled; - - SfxProgress* pProgress; + static SfxProgress* pGlobalProgress; + static ULONG nGlobalRange; + static ULONG nGlobalPercent; + static BOOL bGlobalNoUserBreak; + static ScProgress* pInterpretProgress; + static ScProgress* pOldInterpretProgress; + static ULONG nInterpretProgress; + static BOOL bAllowInterpretProgress; + static ScDocument* pInterpretDoc; + static BOOL bIdleWasDisabled; + + SfxProgress* pProgress; // not implemented ScProgress( const ScProgress& ); - ScProgress& operator=( const ScProgress& ); + ScProgress& operator=( const ScProgress& ); - static void CalcGlobalPercent( ULONG nVal ) + static void CalcGlobalPercent( ULONG nVal ) { nGlobalPercent = nGlobalRange ? nVal * 100 / nGlobalRange : 0; } public: - static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } - static BOOL IsUserBreak() { return !bGlobalNoUserBreak; } - static void CreateInterpretProgress( ScDocument* pDoc, + static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } + static BOOL IsUserBreak() { return !bGlobalNoUserBreak; } + static void CreateInterpretProgress( ScDocument* pDoc, BOOL bWait = TRUE ); - static ScProgress* GetInterpretProgress() { return pInterpretProgress; } - static void DeleteInterpretProgress(); - static ULONG GetInterpretCount() { return nInterpretProgress; } - static ULONG GetGlobalRange() { return nGlobalRange; } - static ULONG GetGlobalPercent() { return nGlobalPercent; } + static ScProgress* GetInterpretProgress() { return pInterpretProgress; } + static void DeleteInterpretProgress(); + static ULONG GetInterpretCount() { return nInterpretProgress; } + static ULONG GetGlobalRange() { return nGlobalRange; } + static ULONG GetGlobalPercent() { return nGlobalPercent; } ScProgress( SfxObjectShell* pObjSh, const String& rText, @@ -92,9 +92,9 @@ public: ScProgress(); #endif // kann NULL sein! - SfxProgress* GetSfxProgress() const { return pProgress; } + SfxProgress* GetSfxProgress() const { return pProgress; } - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ) + BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ) { if ( pProgress ) { @@ -107,7 +107,7 @@ public: } return TRUE; } - BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ) + BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ) { if ( pProgress ) { @@ -120,7 +120,7 @@ public: } return TRUE; } - BOOL SetStateCountDown( ULONG nVal ) + BOOL SetStateCountDown( ULONG nVal ) { if ( pProgress ) { @@ -131,22 +131,22 @@ public: } return TRUE; } - BOOL SetStateOnPercent( ULONG nVal ) - { // nur wenn Prozent mehr als vorher + BOOL SetStateOnPercent( ULONG nVal ) + { // nur wenn Prozent mehr als vorher if ( nGlobalRange && (nVal * 100 / nGlobalRange) > nGlobalPercent ) return SetState( nVal ); return TRUE; } - BOOL SetStateCountDownOnPercent( ULONG nVal ) - { // nur wenn Prozent mehr als vorher + BOOL SetStateCountDownOnPercent( ULONG nVal ) + { // nur wenn Prozent mehr als vorher if ( nGlobalRange && ((nGlobalRange - nVal) * 100 / nGlobalRange) > nGlobalPercent ) return SetStateCountDown( nVal ); return TRUE; } - ULONG GetState() + ULONG GetState() { if ( pProgress ) return pProgress->GetState(); diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 8e84f1e53e36..bc5023728e2a 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -1,7 +1,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/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index e00fce10da1c..7b764f39f2b0 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -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 @@ -45,31 +45,31 @@ private: public: ScRangeList() {} ScRangeList( const ScRangeList& rList ); - virtual ~ScRangeList(); - ScRangeList& operator=(const ScRangeList& rList); - void RemoveAll(); - void Append( const ScRange& rRange ) + virtual ~ScRangeList(); + ScRangeList& operator=(const ScRangeList& rList); + void RemoveAll(); + void Append( const ScRange& rRange ) { ScRangePtr pR = new ScRange( rRange ); Insert( pR, LIST_APPEND ); } - USHORT Parse( const String&, ScDocument* = NULL, + USHORT Parse( const String&, ScDocument* = NULL, USHORT nMask = SCA_VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ); - void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, + void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Join( const ScRange&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRange&, BOOL bIsInList = FALSE ); + BOOL UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - ScRange* Find( const ScAddress& ) const; - BOOL operator==( const ScRangeList& ) const; + ScRange* Find( const ScAddress& ) const; + BOOL operator==( const ScRangeList& ) const; BOOL operator!=( const ScRangeList& r ) const; - BOOL Intersects( const ScRange& ) const; - BOOL In( const ScRange& ) const; - ULONG GetCellCount() const; + BOOL Intersects( const ScRange& ) const; + BOOL In( const ScRange& ) const; + ULONG GetCellCount() const; }; SV_DECL_IMPL_REF( ScRangeList ); @@ -83,22 +83,22 @@ private: using ScRangePairListBase::operator==; public: - virtual ~ScRangePairList(); - ScRangePairList* Clone() const; - void Append( const ScRangePair& rRangePair ) + virtual ~ScRangePairList(); + ScRangePairList* Clone() const; + void Append( const ScRangePair& rRangePair ) { ScRangePair* pR = new ScRangePair( rRangePair ); Insert( pR, LIST_APPEND ); } - void Join( const ScRangePair&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRangePair&, BOOL bIsInList = FALSE ); + BOOL UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void DeleteOnTab( SCTAB nTab ); - ScRangePair* Find( const ScAddress& ) const; - ScRangePair* Find( const ScRange& ) const; - ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; - BOOL operator==( const ScRangePairList& ) const; + ScRangePair* Find( const ScAddress& ) const; + ScRangePair* Find( const ScRange& ) const; + ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; + BOOL operator==( const ScRangePairList& ) const; }; SV_DECL_IMPL_REF( ScRangePairList ); diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index a9f324b8b737..7f3e1232d2b0 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -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 @@ -49,17 +49,17 @@ namespace rtl { typedef USHORT RangeType; -#define RT_NAME ((RangeType)0x0000) -#define RT_DATABASE ((RangeType)0x0001) -#define RT_CRITERIA ((RangeType)0x0002) -#define RT_PRINTAREA ((RangeType)0x0004) -#define RT_COLHEADER ((RangeType)0x0008) -#define RT_ROWHEADER ((RangeType)0x0010) -#define RT_ABSAREA ((RangeType)0x0020) -#define RT_REFAREA ((RangeType)0x0040) -#define RT_ABSPOS ((RangeType)0x0080) -#define RT_SHARED ((RangeType)0x0100) -#define RT_SHAREDMOD ((RangeType)0x0200) +#define RT_NAME ((RangeType)0x0000) +#define RT_DATABASE ((RangeType)0x0001) +#define RT_CRITERIA ((RangeType)0x0002) +#define RT_PRINTAREA ((RangeType)0x0004) +#define RT_COLHEADER ((RangeType)0x0008) +#define RT_ROWHEADER ((RangeType)0x0010) +#define RT_ABSAREA ((RangeType)0x0020) +#define RT_REFAREA ((RangeType)0x0040) +#define RT_ABSPOS ((RangeType)0x0080) +#define RT_SHARED ((RangeType)0x0100) +#define RT_SHAREDMOD ((RangeType)0x0200) //------------------------------------------------------------------------ @@ -68,16 +68,16 @@ class ScTokenArray; class ScRangeData : public ScDataObject { private: - String aName; + String aName; String aUpperName; // #i62977# for faster searching (aName is never modified after ctor) - ScTokenArray* pCode; - ScAddress aPos; - RangeType eType; - ScDocument* pDoc; - USHORT nIndex; - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht - - // max row and column to use for wrapping of references. If -1 use the + ScTokenArray* pCode; + ScAddress aPos; + RangeType eType; + ScDocument* pDoc; + USHORT nIndex; + BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + + // max row and column to use for wrapping of references. If -1 use the // application's default. SCROW mnMaxRow; SCCOL mnMaxCol; @@ -87,18 +87,18 @@ private: public: typedef ::std::map IndexMap; - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const String& rSymbol, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const ScTokenArray& rArr, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME ); - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const ScAddress& rTarget ); // rTarget ist ABSPOS Sprungmarke @@ -107,55 +107,55 @@ public: SC_DLLPUBLIC virtual ~ScRangeData(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL operator== (const ScRangeData& rData) const; + BOOL operator== (const ScRangeData& rData) const; - void GetName( String& rName ) const { rName = aName; } - const String& GetName( void ) const { return aName; } + void GetName( String& rName ) const { rName = aName; } + const String& GetName( void ) const { return aName; } const String& GetUpperName( void ) const { return aUpperName; } - ScAddress GetPos() const { return aPos; } + ScAddress GetPos() const { return aPos; } // Der Index muss eindeutig sein. Ist er 0, wird ein neuer Index vergeben void SetIndex( USHORT nInd ) { nIndex = nInd; } USHORT GetIndex() const { return nIndex; } - ScTokenArray* GetCode() { return pCode; } - USHORT GetErrCode(); - BOOL HasReferences() const; - void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } - ScDocument* GetDocument() const { return pDoc; } - void SetType( RangeType nType ) { eType = nType; } - void AddType( RangeType nType ) { eType = eType|nType; } - RangeType GetType() const { return eType; } - BOOL HasType( RangeType nType ) const; - SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, + ScTokenArray* GetCode() { return pCode; } + USHORT GetErrCode(); + BOOL HasReferences() const; + void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } + ScDocument* GetDocument() const { return pDoc; } + void SetType( RangeType nType ) { eType = nType; } + void AddType( RangeType nType ) { eType = eType|nType; } + RangeType GetType() const { return eType; } + BOOL HasType( RangeType nType ) const; + SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL IsModified() const { return bModified; } + BOOL IsModified() const { return bModified; } - SC_DLLPUBLIC void GuessPosition(); + SC_DLLPUBLIC void GuessPosition(); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; - BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; - BOOL IsValidReference( ScRange& rRef ) const; + SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; + BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; + BOOL IsValidReference( ScRange& rRef ) const; -//UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; - BOOL IsRangeAtBlock( const ScRange& ) const; +//UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; + BOOL IsRangeAtBlock( const ScRange& ) const; - void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); - void TransferTabRef( SCTAB nOldTab, SCTAB nNewTab ); + void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); + void TransferTabRef( SCTAB nOldTab, SCTAB nNewTab ); - void ValidateTabRefs(); + void ValidateTabRefs(); void ReplaceRangeNamesInUse( const IndexMap& rMap ); - static void MakeValidName( String& rName ); - SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); + static void MakeValidName( String& rName ); + SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); SC_DLLPUBLIC void SetMaxRow(SCROW nRow); SCROW GetMaxRow() const; @@ -171,7 +171,7 @@ inline BOOL ScRangeData::HasType( RangeType nType ) const extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* ); #if defined( ICC ) && defined( OS2 ) - static int _Optlink ICCQsortNameCompare( const void* a, const void* b) + static int _Optlink ICCQsortNameCompare( const void* a, const void* b) { return ScRangeData_QsortNameCompare(a,b); } #endif @@ -188,36 +188,36 @@ private: public: ScRangeName(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : - ScSortedCollection ( nLim, nDel, bDup ), - pDoc ( pDocument ), - nSharedMaxIndex ( 1 ) {} // darf nicht 0 sein!! + ScSortedCollection ( nLim, nDel, bDup ), + pDoc ( pDocument ), + nSharedMaxIndex ( 1 ) {} // darf nicht 0 sein!! ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument); - virtual ScDataObject* Clone(ScDocument* pDocP) const + virtual ScDataObject* Clone(ScDocument* pDocP) const { return new ScRangeName(*this, pDocP); } - ScRangeData* operator[]( const USHORT nIndex) const + ScRangeData* operator[]( const USHORT nIndex) const { return (ScRangeData*)At(nIndex); } - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; -//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; - SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; +//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; + SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; - SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; + SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; // SearchNameUpper must be called with an upper-case search string - BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; - void UpdateReference(UpdateRefMode eUpdateRefMode, + BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; + void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - virtual BOOL Insert(ScDataObject* pScDataObject); - SC_DLLPUBLIC ScRangeData* FindIndex(USHORT nIndex); - USHORT GetSharedMaxIndex() { return nSharedMaxIndex; } - void SetSharedMaxIndex(USHORT nInd) { nSharedMaxIndex = nInd; } - USHORT GetEntryIndex(); + void UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + virtual BOOL Insert(ScDataObject* pScDataObject); + SC_DLLPUBLIC ScRangeData* FindIndex(USHORT nIndex); + USHORT GetSharedMaxIndex() { return nSharedMaxIndex; } + void SetSharedMaxIndex(USHORT nInd) { nSharedMaxIndex = nInd; } + USHORT GetEntryIndex(); }; #endif diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 6238ea5f8050..e0b22aeb5633 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -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 @@ -39,19 +39,19 @@ class ScRange; class ScRangeToSequence { public: - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static BOOL FillLongArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static BOOL FillLongArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static BOOL FillStringArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static BOOL FillStringArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ); - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange, BOOL bAllowNV = FALSE ); @@ -61,7 +61,7 @@ public: implementation of XFormulaParser. If , boolean values are treated as ordinary double values 1 (true) and 0 (false). */ - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes = false ); }; @@ -104,8 +104,8 @@ public: class ScByteSequenceToString { public: - // rAny must contain Sequence, - // may or may not contain 0-bytes at the end + // rAny must contain Sequence, + // may or may not contain 0-bytes at the end static BOOL GetString( String& rString, const com::sun::star::uno::Any& rAny, sal_uInt16 nEncoding ); }; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index ea5d2a901b54..b8af2f2d4994 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -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,28 +56,28 @@ public: ScRangeUtil() {} ~ScRangeUtil() {} - BOOL MakeArea ( const String& rAreaStr, - ScArea& rArea, - ScDocument* pDoc, - SCTAB nTab, + BOOL MakeArea ( const String& rAreaStr, + ScArea& rArea, + ScDocument* pDoc, + SCTAB nTab, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - void CutPosString ( const String& theAreaStr, - String& thePosStr ) const; + void CutPosString ( const String& theAreaStr, + String& thePosStr ) const; - BOOL IsAbsTabArea ( const String& rAreaStr, - ScDocument* pDoc, - ScArea*** pppAreas = 0, - USHORT* pAreaCount = 0, - BOOL bAcceptCellRef = FALSE, + BOOL IsAbsTabArea ( const String& rAreaStr, + ScDocument* pDoc, + ScArea*** pppAreas = 0, + USHORT* pAreaCount = 0, + BOOL bAcceptCellRef = FALSE, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL IsAbsArea ( const String& rAreaStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr = 0, - ScRefAddress* pStartPos = 0, - ScRefAddress* pEndPos = 0, + BOOL IsAbsArea ( const String& rAreaStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr = 0, + ScRefAddress* pStartPos = 0, + ScRefAddress* pEndPos = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; BOOL IsRefArea ( const String&, @@ -87,17 +87,17 @@ public: ScRefAddress* = 0 ) const { return FALSE; } - BOOL IsAbsPos ( const String& rPosStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr = 0, - ScRefAddress* pPosTripel = 0, + BOOL IsAbsPos ( const String& rPosStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr = 0, + ScRefAddress* pPosTripel = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL MakeRangeFromName ( const String& rName, - ScDocument* pDoc, - SCTAB nCurTab, - ScRange& rRange, + BOOL MakeRangeFromName ( const String& rName, + ScDocument* pDoc, + SCTAB nCurTab, + ScRange& rRange, RutlNameScope eScope=RUTL_NAMES, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; }; @@ -109,29 +109,29 @@ class SC_DLLPUBLIC ScRangeStringConverter public: // helper methods - static void AssignString( + static void AssignString( ::rtl::OUString& rString, const ::rtl::OUString& rNewStr, sal_Bool bAppendStr, sal_Unicode cSeperator = ' '); - static sal_Int32 IndexOf( + static sal_Int32 IndexOf( const ::rtl::OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset, sal_Unicode cQuote = '\''); - static sal_Int32 IndexOfDifferent( + static sal_Int32 IndexOfDifferent( const ::rtl::OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset ); - static sal_Int32 GetTokenCount( + static sal_Int32 GetTokenCount( const ::rtl::OUString& rString, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static void GetTokenByOffset( + static void GetTokenByOffset( ::rtl::OUString& rToken, const ::rtl::OUString& rString, sal_Int32& nOffset, @@ -139,12 +139,12 @@ public: sal_Unicode cQuote = '\''); static void AppendTableName( - ::rtl::OUStringBuffer& rBuf, + ::rtl::OUStringBuffer& rBuf, const ::rtl::OUString& rTabName, sal_Unicode cQuote = '\''); // String to Range core - static sal_Bool GetAddressFromString( + static sal_Bool GetAddressFromString( ScAddress& rAddress, const ::rtl::OUString& rAddressStr, const ScDocument* pDocument, @@ -152,7 +152,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeFromString( + static sal_Bool GetRangeFromString( ScRange& rRange, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -160,7 +160,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeListFromString( + static sal_Bool GetRangeListFromString( ScRangeList& rRangeList, const ::rtl::OUString& rRangeListStr, const ScDocument* pDocument, @@ -168,7 +168,7 @@ public: sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetAreaFromString( + static sal_Bool GetAreaFromString( ScArea& rArea, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -178,7 +178,7 @@ public: sal_Unicode cQuote = '\''); // String to Range API - static sal_Bool GetAddressFromString( + static sal_Bool GetAddressFromString( ::com::sun::star::table::CellAddress& rAddress, const ::rtl::OUString& rAddressStr, const ScDocument* pDocument, @@ -186,7 +186,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeFromString( + static sal_Bool GetRangeFromString( ::com::sun::star::table::CellRangeAddress& rRange, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -194,7 +194,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeListFromString( + static sal_Bool GetRangeListFromString( ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ::rtl::OUString& rRangeListStr, const ScDocument* pDocument, @@ -203,7 +203,7 @@ public: sal_Unicode cQuote = '\''); // Range to String core - static void GetStringFromAddress( + static void GetStringFromAddress( ::rtl::OUString& rString, const ScAddress& rAddress, const ScDocument* pDocument, @@ -211,7 +211,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRange( + static void GetStringFromRange( ::rtl::OUString& rString, const ScRange& rRange, const ScDocument* pDocument, @@ -219,7 +219,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRangeList( + static void GetStringFromRangeList( ::rtl::OUString& rString, const ScRangeList* pRangeList, const ScDocument* pDocument, @@ -227,7 +227,7 @@ public: sal_Unicode cSeperator = ' ', sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); - static void GetStringFromArea( + static void GetStringFromArea( ::rtl::OUString& rString, const ScArea& rArea, const ScDocument* pDocument, @@ -237,7 +237,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); // Range to String API - static void GetStringFromAddress( + static void GetStringFromAddress( ::rtl::OUString& rString, const ::com::sun::star::table::CellAddress& rAddress, const ScDocument* pDocument, @@ -245,7 +245,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRange( + static void GetStringFromRange( ::rtl::OUString& rString, const ::com::sun::star::table::CellRangeAddress& rRange, const ScDocument* pDocument, @@ -253,7 +253,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRangeList( + static void GetStringFromRangeList( ::rtl::OUString& rString, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, @@ -264,7 +264,7 @@ public: // XML Range to Calc Range static void GetStringFromXMLRangeString( ::rtl::OUString& rString, - const ::rtl::OUString& rXMLRange, + const ::rtl::OUString& rXMLRange, ScDocument* pDoc ); }; @@ -281,9 +281,9 @@ public: ScArea( const ScArea& r ); - ScArea& operator= ( const ScArea& r ); - BOOL operator== ( const ScArea& r ) const; - BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } + ScArea& operator= ( const ScArea& r ); + BOOL operator== ( const ScArea& r ) const; + BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } public: SCTAB nTab; @@ -296,24 +296,24 @@ public: //------------------------------------------------------------------------ // -// gibt Bereiche mit Referenz und alle DB-Bereiche zurueck +// gibt Bereiche mit Referenz und alle DB-Bereiche zurueck // class SC_DLLPUBLIC ScAreaNameIterator { private: - ScRangeName* pRangeName; - ScDBCollection* pDBCollection; - BOOL bFirstPass; - USHORT nPos; - String aStrNoName; + ScRangeName* pRangeName; + ScDBCollection* pDBCollection; + BOOL bFirstPass; + USHORT nPos; + String aStrNoName; public: ScAreaNameIterator( ScDocument* pDoc ); ~ScAreaNameIterator() {} - BOOL Next( String& rName, ScRange& rRange ); - BOOL WasDBName() const { return !bFirstPass; } + BOOL Next( String& rName, ScRange& rRange ); + BOOL WasDBName() const { return !bFirstPass; } }; diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 348159c12ce1..00581f5045a9 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -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 @@ -30,95 +30,95 @@ #include -// ID's fuer Dateien: - -#define SCID_SIZES 0x4200 - -#define SCID_POOLS 0x4210 -#define SCID_DOCPOOL 0x4211 -#define SCID_STYLEPOOL 0x4212 -#define SCID_NEWPOOLS 0x4213 // ID fuer SC 3.0a -#define SCID_EDITPOOL 0x4214 - -#define SCID_DOCUMENT 0x4220 -#define SCID_DOCFLAGS 0x4221 -#define SCID_TABLE 0x4222 -#define SCID_DRAWING 0x4223 -#define SCID_RANGENAME 0x4224 -#define SCID_DBAREAS 0x4225 -#define SCID_PIVOT 0x4226 -#define SCID_CHARTS 0x4227 -#define SCID_NUMFORMAT 0x4228 -#define SCID_DOCOPTIONS 0x4229 -#define SCID_VIEWOPTIONS 0x422a -#define SCID_PRINTSETUP 0x422b -#define SCID_CHARSET 0x422c -#define SCID_NEWDOCUMENT 0x422d // ID fuer SC 3.0a -#define SCID_DDELINKS 0x422e -#define SCID_AREALINKS 0x422f -#define SCID_CONDFORMATS 0x4230 -#define SCID_VALIDATION 0x4231 -#define SCID_COLNAMERANGES 0x4232 -#define SCID_ROWNAMERANGES 0x4233 -#define SCID_DETOPLIST 0x4234 -#define SCID_CONSOLIDATA 0x4235 -#define SCID_CHANGETRACK 0x4236 -#define SCID_CHGVIEWSET 0x4237 -#define SCID_LINKUPMODE 0x4238 -#define SCID_DATAPILOT 0x4239 - -#define SCID_COLUMNS 0x4240 -#define SCID_COLROWFLAGS 0x4241 -#define SCID_TABOPTIONS 0x4242 -#define SCID_TABLINK 0x4243 - -#define SCID_COLDATA 0x4250 -#define SCID_COLNOTES 0x4251 -#define SCID_COLATTRIB 0x4252 - -#define SCID_DRAWPOOL 0x4260 -#define SCID_DRAWMODEL 0x4261 - - - -// Dateiversion -// Falls das obere Byte inkrementiert wird, wird das Doc von -// aelteren SCs nicht mehr geladen! - -#define SC_INITIAL_VERSION 0x0001 -#define SC_FORMULA_LCLVER 0x0002 // Formalen mit lokaler VerNr +// ID's fuer Dateien: + +#define SCID_SIZES 0x4200 + +#define SCID_POOLS 0x4210 +#define SCID_DOCPOOL 0x4211 +#define SCID_STYLEPOOL 0x4212 +#define SCID_NEWPOOLS 0x4213 // ID fuer SC 3.0a +#define SCID_EDITPOOL 0x4214 + +#define SCID_DOCUMENT 0x4220 +#define SCID_DOCFLAGS 0x4221 +#define SCID_TABLE 0x4222 +#define SCID_DRAWING 0x4223 +#define SCID_RANGENAME 0x4224 +#define SCID_DBAREAS 0x4225 +#define SCID_PIVOT 0x4226 +#define SCID_CHARTS 0x4227 +#define SCID_NUMFORMAT 0x4228 +#define SCID_DOCOPTIONS 0x4229 +#define SCID_VIEWOPTIONS 0x422a +#define SCID_PRINTSETUP 0x422b +#define SCID_CHARSET 0x422c +#define SCID_NEWDOCUMENT 0x422d // ID fuer SC 3.0a +#define SCID_DDELINKS 0x422e +#define SCID_AREALINKS 0x422f +#define SCID_CONDFORMATS 0x4230 +#define SCID_VALIDATION 0x4231 +#define SCID_COLNAMERANGES 0x4232 +#define SCID_ROWNAMERANGES 0x4233 +#define SCID_DETOPLIST 0x4234 +#define SCID_CONSOLIDATA 0x4235 +#define SCID_CHANGETRACK 0x4236 +#define SCID_CHGVIEWSET 0x4237 +#define SCID_LINKUPMODE 0x4238 +#define SCID_DATAPILOT 0x4239 + +#define SCID_COLUMNS 0x4240 +#define SCID_COLROWFLAGS 0x4241 +#define SCID_TABOPTIONS 0x4242 +#define SCID_TABLINK 0x4243 + +#define SCID_COLDATA 0x4250 +#define SCID_COLNOTES 0x4251 +#define SCID_COLATTRIB 0x4252 + +#define SCID_DRAWPOOL 0x4260 +#define SCID_DRAWMODEL 0x4261 + + + +// Dateiversion +// Falls das obere Byte inkrementiert wird, wird das Doc von +// aelteren SCs nicht mehr geladen! + +#define SC_INITIAL_VERSION 0x0001 +#define SC_FORMULA_LCLVER 0x0002 // Formalen mit lokaler VerNr //-------------------------------- -#define SC_NEW_TOKEN_ARRAYS 0x0003 // neues TokenArray-Format -#define SC_FORMULA_VALUES 0x0004 // Werte in Formelzellen -#define SC_FORMULA_VALUES2 0x0005 // Werte in Formelzellen -#define SC_DATABYTES 0x0006 // Datenbytes, kleine Tables -#define SC_DATABYTES2 0x0007 // Datenbytes, kleine Tables -#define SC_NUMFMT 0x0008 // Zahlenformat an Formelzelle -#define SC_NEWIF 0x0009 // neue Codierung von ocIf (komp.) +#define SC_NEW_TOKEN_ARRAYS 0x0003 // neues TokenArray-Format +#define SC_FORMULA_VALUES 0x0004 // Werte in Formelzellen +#define SC_FORMULA_VALUES2 0x0005 // Werte in Formelzellen +#define SC_DATABYTES 0x0006 // Datenbytes, kleine Tables +#define SC_DATABYTES2 0x0007 // Datenbytes, kleine Tables +#define SC_NUMFMT 0x0008 // Zahlenformat an Formelzelle +#define SC_NEWIF 0x0009 // neue Codierung von ocIf (komp.) //-------------------------------- -#define SC_RELATIVE_REFS 0x0010 // relative Referenzen -#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal der Formelzelle -#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges als ScRangePair +#define SC_RELATIVE_REFS 0x0010 // relative Referenzen +#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal der Formelzelle +#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges als ScRangePair //-------------------------------- -#define SC_31_EXPORT_VER 0x0012 // Version bei 3.1-Export +#define SC_31_EXPORT_VER 0x0012 // Version bei 3.1-Export //-------------------------------- ab 4.0 -#define SC_32K_ROWS 0x0100 // 32000 Zeilen - inkompatibel -#define SC_FONTCHARSET 0x0101 // Font-CharSets muessen stimmen +#define SC_32K_ROWS 0x0100 // 32000 Zeilen - inkompatibel +#define SC_FONTCHARSET 0x0101 // Font-CharSets muessen stimmen //-------------------------------- -#define SC_40_EXPORT_VER 0x0101 // Version bei 4.0-Export +#define SC_40_EXPORT_VER 0x0101 // Version bei 4.0-Export //-------------------------------- ab 5.0 -#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode -#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implizite Schnittmenge -#define SC_VERSION_EDITPOOL 0x0203 // EditCells mit EditPool -#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal der Formelzelle wirklich +#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode +#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implizite Schnittmenge +#define SC_VERSION_EDITPOOL 0x0203 // EditCells mit EditPool +#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal der Formelzelle wirklich //-------------------------------- ab 5.2 -#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // #73616# CONVERT function recalculated on each load +#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // #73616# CONVERT function recalculated on each load //-------------------------------- -#define SC_CURRENT_VERSION 0x0205 +#define SC_CURRENT_VERSION 0x0205 -// alles ueber SC_31_EXPORT_VER muss auch beim Speichern abgefragt werden, -// weil 3.1-Export diese Versionsnummer schreibt. +// alles ueber SC_31_EXPORT_VER muss auch beim Speichern abgefragt werden, +// weil 3.1-Export diese Versionsnummer schreibt. // btw: 10 nach 09 ist kein Zaehlfehler sondern eine absichtliche Luecke, // weil nicht klar war, wie lange die RelRefs Entwicklung dauern wuerde.. :) @@ -127,42 +127,42 @@ class SvStream; // ----------------------------------------------------------------------- - // Header mit Groessenangaben fuer mehrere Objekte + // Header mit Groessenangaben fuer mehrere Objekte class ScMultipleReadHeader { private: - SvStream& rStream; - BYTE* pBuf; - SvMemoryStream* pMemStream; - ULONG nEndPos; - ULONG nEntryEnd; - ULONG nTotalEnd; + SvStream& rStream; + BYTE* pBuf; + SvMemoryStream* pMemStream; + ULONG nEndPos; + ULONG nEntryEnd; + ULONG nTotalEnd; public: ScMultipleReadHeader(SvStream& rNewStream); ~ScMultipleReadHeader(); - void StartEntry(); - void EndEntry(); - ULONG BytesLeft() const; + void StartEntry(); + void EndEntry(); + ULONG BytesLeft() const; }; class ScMultipleWriteHeader { private: - SvStream& rStream; - SvMemoryStream aMemStream; - ULONG nDataPos; - sal_uInt32 nDataSize; - ULONG nEntryStart; + SvStream& rStream; + SvMemoryStream aMemStream; + ULONG nDataPos; + sal_uInt32 nDataSize; + ULONG nEntryStart; public: ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0); ~ScMultipleWriteHeader(); - void StartEntry(); - void EndEntry(); + void StartEntry(); + void EndEntry(); }; #endif diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx index 7b24e1a409b4..48226e022019 100644 --- a/sc/inc/recursionhelper.hxx +++ b/sc/inc/recursionhelper.hxx @@ -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 @@ -123,7 +123,7 @@ class ScRecursionHelper void StartIteration() { SetInIterationReturn( false); - nIteration = 1; + nIteration = 1; bConverging = false; aLastIterationStart = GetIterationStart(); } diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index f42f930084be..c60ab3f6d961 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -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 @@ -187,7 +187,7 @@ struct ScComplexRefData // Complex reference (a range) into the sheet { return Ref1.IsDeleted() || Ref2.IsDeleted(); } inline BOOL Valid() const { return Ref1.Valid() && Ref2.Valid(); } - /** In external references nTab is -1 for the start tab and -1 for the end + /** In external references nTab is -1 for the start tab and -1 for the end tab if one sheet, or >=0 if more than one sheets. */ inline bool ValidExternal() const; diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx index 775571adeab7..db7538bf7d2a 100644 --- a/sc/inc/reffind.hxx +++ b/sc/inc/reffind.hxx @@ -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 @@ -38,12 +38,12 @@ class ScDocument; class ScRefFinder { private: - String aFormula; + String aFormula; formula::FormulaGrammar::AddressConvention eConv; - ScDocument* pDoc; - xub_StrLen nFound; - xub_StrLen nSelStart; - xub_StrLen nSelEnd; + ScDocument* pDoc; + xub_StrLen nFound; + xub_StrLen nSelStart; + xub_StrLen nSelEnd; public: static const sal_Unicode __FAR_DATA pDelimiters[]; @@ -53,12 +53,12 @@ public: formula::FormulaGrammar::AddressConvention eConvP = formula::FormulaGrammar::CONV_OOO ); ~ScRefFinder(); - const String& GetText() const { return aFormula; } - xub_StrLen GetFound() const { return nFound; } - xub_StrLen GetSelStart() const { return nSelStart; } - xub_StrLen GetSelEnd() const { return nSelEnd; } + const String& GetText() const { return aFormula; } + xub_StrLen GetFound() const { return nFound; } + xub_StrLen GetSelStart() const { return nSelStart; } + xub_StrLen GetSelEnd() const { return nSelEnd; } - void ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ); + void ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ); }; diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 2a8512848ef0..51a7e520e036 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -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 @@ -42,34 +42,34 @@ DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* ) class ScRefreshTimerControl { private: - ::vos::OMutex aMutex; - USHORT nBlockRefresh; + ::vos::OMutex aMutex; + USHORT nBlockRefresh; public: #if SC_REFRESHTIMER_CONTROL_LIST - ScRefreshTimerList aList; + ScRefreshTimerList aList; #endif ScRefreshTimerControl() : nBlockRefresh(0) {} - void SetAllowRefresh( BOOL b ) + void SetAllowRefresh( BOOL b ) { if ( b && nBlockRefresh ) --nBlockRefresh; else if ( !b && nBlockRefresh < (USHORT)(~0) ) ++nBlockRefresh; } - BOOL IsRefreshAllowed() const { return !nBlockRefresh; } - ::vos::OMutex& GetMutex() { return aMutex; } + BOOL IsRefreshAllowed() const { return !nBlockRefresh; } + ::vos::OMutex& GetMutex() { return aMutex; } }; class ScRefreshTimerProtector { private: - ScRefreshTimerControl * const * ppControl; + ScRefreshTimerControl * const * ppControl; public: - ScRefreshTimerProtector( ScRefreshTimerControl * const * pp ); + ScRefreshTimerProtector( ScRefreshTimerControl * const * pp ); ~ScRefreshTimerProtector() { if ( ppControl && *ppControl ) @@ -81,16 +81,16 @@ public: class ScRefreshTimer : public AutoTimer { private: - ScRefreshTimerControl * const * ppControl; + ScRefreshTimerControl * const * ppControl; - void AppendToControl() + void AppendToControl() { #if SC_REFRESHTIMER_CONTROL_LIST if ( ppControl && *ppControl ) (*ppControl)->aList.Insert( this, LIST_APPEND ); #endif } - void RemoveFromControl() + void RemoveFromControl() { #if SC_REFRESHTIMER_CONTROL_LIST if ( ppControl && *ppControl ) @@ -98,7 +98,7 @@ private: #endif } - void Start() + void Start() { if ( GetTimeout() ) AutoTimer::Start(); @@ -115,42 +115,42 @@ public: ScRefreshTimer( const ScRefreshTimer& r ) : AutoTimer( r ), ppControl(0) {} - virtual ~ScRefreshTimer(); + virtual ~ScRefreshTimer(); - ScRefreshTimer& operator=( const ScRefreshTimer& r ) + ScRefreshTimer& operator=( const ScRefreshTimer& r ) { SetRefreshControl(0); AutoTimer::operator=( r ); return *this; } - BOOL operator==( const ScRefreshTimer& r ) const + BOOL operator==( const ScRefreshTimer& r ) const { return GetTimeout() == r.GetTimeout(); } - BOOL operator!=( const ScRefreshTimer& r ) const + BOOL operator!=( const ScRefreshTimer& r ) const { return !ScRefreshTimer::operator==( r ); } - void StartRefreshTimer() + void StartRefreshTimer() { Start(); } - void SetRefreshControl( ScRefreshTimerControl * const * pp ) + void SetRefreshControl( ScRefreshTimerControl * const * pp ) { RemoveFromControl(); ppControl = pp; AppendToControl(); } - void SetRefreshHandler( const Link& rLink ) + void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); } - ULONG GetRefreshDelay() const + ULONG GetRefreshDelay() const { return GetTimeout() / 1000; } - void StopRefreshTimer() + void StopRefreshTimer() { Stop(); } - SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds ); - SC_DLLPUBLIC virtual void Timeout(); + SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds ); + SC_DLLPUBLIC virtual void Timeout(); }; diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index 86fd36f691fa..4a1e47ccc5de 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -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 @@ -48,9 +48,9 @@ private: ~ScRefTokenHelper(); public: - /** - * Compile an array of reference tokens from a data source range string. - * The source range may consist of multiple ranges separated by ';'s. + /** + * Compile an array of reference tokens from a data source range string. + * The source range may consist of multiple ranges separated by ';'s. */ static void compileRangeRepresentation( ::std::vector& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, @@ -60,7 +60,7 @@ public: static void getRangeListFromTokens(ScRangeList& rRangeList, const ::std::vector& pTokens); - /** + /** * Create a double reference token from a range object. */ static void getTokenFromRange(ScSharedTokenRef& pToken, const ScRange& rRange); diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4a697dc57558..0c4013adc99d 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.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 @@ -35,289 +35,289 @@ #include // ->Svx-IDs #endif -#define VAR_ARGS 30 // variable Parameter in scfuncs.src +#define VAR_ARGS 30 // variable Parameter in scfuncs.src -#define RID_HANDLEBITMAP 10005 +#define RID_HANDLEBITMAP 10005 // Bereiche ------------------------------------------------------------------ -#define SC_VIEW_START (SID_SC_START) -#define SC_VIEW_END (SID_SC_START + 99) -#define SC_MESSAGE_START (SID_SC_START + 100) -#define SC_MESSAGE_END (SID_SC_START + 199) -#define SC_FUNCTION_START (SID_SC_START + 200) -#define SC_FUNCTION_END (SID_SC_START + 299) -#define SC_PARAM_START (SID_SC_START + 300) -#define SC_PARAM_END (SID_SC_START + 399) +#define SC_VIEW_START (SID_SC_START) +#define SC_VIEW_END (SID_SC_START + 99) +#define SC_MESSAGE_START (SID_SC_START + 100) +#define SC_MESSAGE_END (SID_SC_START + 199) +#define SC_FUNCTION_START (SID_SC_START + 200) +#define SC_FUNCTION_END (SID_SC_START + 299) +#define SC_PARAM_START (SID_SC_START + 300) +#define SC_PARAM_END (SID_SC_START + 399) -// kompatibel zu frueher bleiben: -#define SC_RESOURCE_START (RID_APP_START+5000) -#define SC_RESOURCE_END (RID_APP_END) +// kompatibel zu frueher bleiben: +#define SC_RESOURCE_START (RID_APP_START+5000) +#define SC_RESOURCE_END (RID_APP_END) // --------------------------------------------------------------------------- // Hilfe IDs ----------------------------------------------------------------- -// Calc hat einen Bereich von 2000 IDs -// Die Funktionen brauchen 11*90 = 990 IDs - -#define HID_SC_FUNC_START (HID_SC_START + 0) -#define HID_INSWIN_START (HID_SC_START + 1000) -#define HID_SC_SHEET_START (HID_SC_START + 1010) -#define HID_SC_SHELL_START (HID_SC_START + 1030) -#define HID_SC_WIN_START (HID_SC_START + 1050) -#define HID_SC_CONTROL_START (HID_SC_START + 1070) -#define HID_SC_DLG_START (HID_SC_START + 1100) -#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) -#define HID_SC_MENU_START (HID_SC_START + 1180) -#define HID_SC_OTHER_START (HID_SC_START + 1230) -#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions +// Calc hat einen Bereich von 2000 IDs +// Die Funktionen brauchen 11*90 = 990 IDs + +#define HID_SC_FUNC_START (HID_SC_START + 0) +#define HID_INSWIN_START (HID_SC_START + 1000) +#define HID_SC_SHEET_START (HID_SC_START + 1010) +#define HID_SC_SHELL_START (HID_SC_START + 1030) +#define HID_SC_WIN_START (HID_SC_START + 1050) +#define HID_SC_CONTROL_START (HID_SC_START + 1070) +#define HID_SC_DLG_START (HID_SC_START + 1100) +#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) +#define HID_SC_MENU_START (HID_SC_START + 1180) +#define HID_SC_OTHER_START (HID_SC_START + 1230) +#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions #define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions // --------------------------------------------------------------------------- -#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) -#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) -#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) -#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) -#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) -#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) -#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) +#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) +#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) +#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) +#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) +#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) +#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) +#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) // Hilfe IDs fuer Vorlagen --------------------------------------------------- -#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) -#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 ) -#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 ) -#define HID_SC_SHEET_CELL_UEB (HID_SC_SHEET_START +3 ) -#define HID_SC_SHEET_CELL_UEB1 (HID_SC_SHEET_START +4 ) -#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 ) -#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 ) +#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) +#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 ) +#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 ) +#define HID_SC_SHEET_CELL_UEB (HID_SC_SHEET_START +3 ) +#define HID_SC_SHEET_CELL_UEB1 (HID_SC_SHEET_START +4 ) +#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 ) +#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 ) // Hilfe IDs fuer Shells (Helferlein) (max.20) ------------------------------- -#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 ) -#define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 ) -#define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 ) -#define HID_SCSHELL_DRTXTOB (HID_SC_SHELL_START +3 ) -#define HID_SCSHELL_PIVOTSH (HID_SC_SHELL_START +4 ) -#define HID_SCSHELL_PREVWSH (HID_SC_SHELL_START +5 ) -#define HID_SCSHELL_TABVWSH (HID_SC_SHELL_START +6 ) -#define HID_SCSHELL_AUDIT (HID_SC_SHELL_START +7 ) -#define HID_SCSHELL_DRAWFORMSH (HID_SC_SHELL_START +8 ) -#define HID_SCSHELL_CELLSH (HID_SC_SHELL_START +9 ) -#define HID_SCSHELL_FORMATSH (HID_SC_SHELL_START +10) -#define HID_SCSHELL_OLEOBEJCTSH (HID_SC_SHELL_START +11) -#define HID_SCSHELL_CHARTSH (HID_SC_SHELL_START +12) -#define HID_SCSHELL_GRAPHIC (HID_SC_SHELL_START +13) -#define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) -#define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) +#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 ) +#define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 ) +#define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 ) +#define HID_SCSHELL_DRTXTOB (HID_SC_SHELL_START +3 ) +#define HID_SCSHELL_PIVOTSH (HID_SC_SHELL_START +4 ) +#define HID_SCSHELL_PREVWSH (HID_SC_SHELL_START +5 ) +#define HID_SCSHELL_TABVWSH (HID_SC_SHELL_START +6 ) +#define HID_SCSHELL_AUDIT (HID_SC_SHELL_START +7 ) +#define HID_SCSHELL_DRAWFORMSH (HID_SC_SHELL_START +8 ) +#define HID_SCSHELL_CELLSH (HID_SC_SHELL_START +9 ) +#define HID_SCSHELL_FORMATSH (HID_SC_SHELL_START +10) +#define HID_SCSHELL_OLEOBEJCTSH (HID_SC_SHELL_START +11) +#define HID_SCSHELL_CHARTSH (HID_SC_SHELL_START +12) +#define HID_SCSHELL_GRAPHIC (HID_SC_SHELL_START +13) +#define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) +#define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) // Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) -#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) +#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) +#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) // Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- -// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) -#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) -#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) -#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) -#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) -#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) -#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) -#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) -#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) -#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) -#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) -#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) -// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) -//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) -//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) -// Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) -#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) -#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) -#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) -#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) -#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) -#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) -#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) -#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) -#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) -#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) -// Teilergebnisse -#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) -#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) -#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) +// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts +#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) +#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) +#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) +#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) +#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) +#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) +#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) +#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) +#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) +#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) +#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) +#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) +// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! +//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) +//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) +//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) +// Eintraege im Navigator +#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) +#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) +#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) +#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) +#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) +#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) +#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) +#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) +#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) +#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) +#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) +// Teilergebnisse +#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) +#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) +#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) // -#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) -// Bereich ist voll! +#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) +// Bereich ist voll! // Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) -#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) -#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) -#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) -#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) -#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) -#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) -#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) -#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) -#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) -#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) -#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) -#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) -#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) -#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) -#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) -#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) - -#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) -#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) -#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) - -#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) -#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) -#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) -#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) - -#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) -#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) -#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) - -#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) - -#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) -#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) -#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) -#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) -#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) - -#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) -#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) -#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) -#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) -#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) -#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) -#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) - -#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) -#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) - -#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) -#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) - -#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) - -#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) -#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) - -// Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) -#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) -#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) -#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) -#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) - -#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) -#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) - -#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) -#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) -#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) - -#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) -#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) - -#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) -#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) - -#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) -#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) -#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) - -#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) -#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) -#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) +#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) +#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) +#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) +#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) +#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) +#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) +#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) +#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) +#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) +#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) +#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) +#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) +#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) +#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) +#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) +#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) +#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) + +#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) +#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) +#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) + +#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) +#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) +#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) +#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) + +#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) +#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) +#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) + +#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) + +#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) +#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) +#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) +#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) +#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) + +#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) +#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) +#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) +#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) +#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) +#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) +#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) + +#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) +#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) + +#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) +#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) + +#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) + +#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) +#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) + +// Funktionsautopilot: nur als Unique-IDs +#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) +#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) +#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) +#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) +#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) + +#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) +#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) + +#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) +#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) +#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) + +#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) +#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) + +#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) +#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) + +#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) +#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) +#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) + +#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) +#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) +#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) //Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) -#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) -#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) +#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) +#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) +#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- -#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) -#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) -#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) -#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) -#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) +#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) +#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) +#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) +#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) +#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) -// wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) -#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) +// wrong group - HID_SC_DLG_START is full +#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) +#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) -#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) +#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) #define HID_CHG_PROTECT ( HID_SC_TOOLBOX_START + 8 ) -#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) +#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) #define HID_SC_REN_AFMT_DLG ( HID_SC_TOOLBOX_START + 10 ) // Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) -#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) -#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) -#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) -#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) -#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) -#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) -#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) -#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) -#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) -#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) -#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) -#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) -#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) -#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) -#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) -#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) -#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) -#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) -#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) -#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) -#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) -#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) -#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) -#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) -#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) -#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) -#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) - -#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) -#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) -#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) -#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) -#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) -#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) -#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) -#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) -#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) - -#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) -#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) -#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) -#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) -#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) +#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) +#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) +#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) +#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) +#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) +#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) +#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) +#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) +#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) +#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) +#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) +#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) +#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) +#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) +#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) +#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) +#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) +#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) +#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) +#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) +#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) +#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) +#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) +#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) +#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) +#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) +#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) +#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) + +#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) +#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) +#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) +#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) +#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) +#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) +#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) +#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) +#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) + +#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) +#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) +#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) +#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) +#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) #define HID_SC_CHANGES_COMMENT ( HID_SC_MENU_START + 42 ) -#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) -#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) -#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) -#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) +#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) +#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) +#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) +#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) -#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) -#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) -#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) +#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) +#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) +#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) // Other help IDs (max.70) --------------------------------------------------- #define HID_SCDLG_LINKAREAURL ( HID_SC_OTHER_START ) @@ -344,7 +344,7 @@ #define HID_SC_DPSHOWDETAIL ( HID_SC_OTHER_START + 16 ) // #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) +#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) #define HID_SC_SOLVEROPTIONS ( HID_SC_OTHER_START + 18 ) #define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 ) @@ -362,99 +362,99 @@ #define HID_SC_HF_FR_DEFINED ( HID_SC_OTHER_START + 29 ) // Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) -#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) -#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) -#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) -#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) -#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) -#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) -#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) -#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) -#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) -#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) -#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) -#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) -#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) -#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) -#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) -#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) -#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) -#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) -#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) -#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) -#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) -#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) -#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) -#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) -#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) -#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) -#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) -#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) -#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) -#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) -#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) -#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) -#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) -#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) -#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) -#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) -#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) -#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) -#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) -#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) -#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) -#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) -#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) -#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) -#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) -#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) -#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) -#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) -#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) -#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) -#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) -#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) -#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) -#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) -#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) -#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) -#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) -#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) -#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) -#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) -#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) -#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) -#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) -#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) -#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) -#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) -#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) -#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) -#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) -#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) -#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) -#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) -#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) -#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) -#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) -#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) -#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) -#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) -#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) -#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) -#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) -#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) -#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) -#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) -#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) -#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) -#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) -#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) -#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) -#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) -#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) -#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) +#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) +#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) +#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) +#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) +#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) +#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) +#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) +#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) +#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) +#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) +#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) +#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) +#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) +#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) +#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) +#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) +#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) +#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) +#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) +#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) +#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) +#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) +#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) +#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) +#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) +#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) +#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) +#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) +#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) +#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) +#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) +#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) +#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) +#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) +#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) +#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) +#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) +#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) +#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) +#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) +#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) +#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) +#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) +#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) +#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) +#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) +#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) +#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) +#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) +#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) +#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) +#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) +#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) +#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) +#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) +#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) +#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) +#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) +#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) +#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) +#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) +#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) +#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) +#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) +#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) +#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) +#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) +#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) +#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) +#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) +#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) +#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) +#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) +#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) +#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) +#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) +#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) +#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) +#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) +#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) +#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) +#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) +#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) +#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) +#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) +#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) +#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) +#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) +#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) +#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) +#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) +#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) +#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) // DateFunc Addin Functions (max.20) ----------------------------------------- #define HID_DAI_FUNC_DAYSINMONTH ( HID_SC_DAI_FUNCS_START ) @@ -470,87 +470,87 @@ // View-Funktionen (max. 100) ------------------------------------------------ -#define FID_TESTFUNC0 (SC_VIEW_START) -#define FID_TESTFUNC1 (SC_VIEW_START + 1) -#define FID_TESTFUNC2 (SC_VIEW_START + 2) -#define FID_TESTFUNC3 (SC_VIEW_START + 3) -#define FID_TESTFUNC4 (SC_VIEW_START + 4) -#define FID_TESTFUNC5 (SC_VIEW_START + 5) -#define FID_TESTFUNC6 (SC_VIEW_START + 6) -#define FID_TESTFUNC7 (SC_VIEW_START + 7) -#define FID_TESTFUNC8 (SC_VIEW_START + 8) -#define FID_TESTFUNC9 (SC_VIEW_START + 9) -#define FID_SCALESTATUS (SC_VIEW_START + 10) -#define FID_COLOR (SC_VIEW_START + 11) -//aus sfx: #define SID_REPAINT (SC_VIEW_START + 12) -#define SID_UPDATECHART (SC_VIEW_START + 13) -#define FID_MARKLEFT (SC_VIEW_START + 14) -#define FID_MARKRIGHT (SC_VIEW_START + 15) -#define FID_MARKUP (SC_VIEW_START + 16) -#define FID_MARKDOWN (SC_VIEW_START + 17) -#define FID_MARKPAGEUP (SC_VIEW_START + 18) -#define FID_MARKPAGEDOWN (SC_VIEW_START + 19) +#define FID_TESTFUNC0 (SC_VIEW_START) +#define FID_TESTFUNC1 (SC_VIEW_START + 1) +#define FID_TESTFUNC2 (SC_VIEW_START + 2) +#define FID_TESTFUNC3 (SC_VIEW_START + 3) +#define FID_TESTFUNC4 (SC_VIEW_START + 4) +#define FID_TESTFUNC5 (SC_VIEW_START + 5) +#define FID_TESTFUNC6 (SC_VIEW_START + 6) +#define FID_TESTFUNC7 (SC_VIEW_START + 7) +#define FID_TESTFUNC8 (SC_VIEW_START + 8) +#define FID_TESTFUNC9 (SC_VIEW_START + 9) +#define FID_SCALESTATUS (SC_VIEW_START + 10) +#define FID_COLOR (SC_VIEW_START + 11) +//aus sfx: #define SID_REPAINT (SC_VIEW_START + 12) +#define SID_UPDATECHART (SC_VIEW_START + 13) +#define FID_MARKLEFT (SC_VIEW_START + 14) +#define FID_MARKRIGHT (SC_VIEW_START + 15) +#define FID_MARKUP (SC_VIEW_START + 16) +#define FID_MARKDOWN (SC_VIEW_START + 17) +#define FID_MARKPAGEUP (SC_VIEW_START + 18) +#define FID_MARKPAGEDOWN (SC_VIEW_START + 19) // Slot-IDs fuer Attribute: -#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page -#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31) -#define SID_SCATTR_MARGIN (SC_VIEW_START + 32) +#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page +#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31) +#define SID_SCATTR_MARGIN (SC_VIEW_START + 32) #define SID_SCATTR_STACKED (SC_VIEW_START + 33) -#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35) -#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // Protection-Page +#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35) +#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // Protection-Page // sonstige Slot-IDs: #define SID_SCUSERLISTS (SC_VIEW_START + 37) // Benutzerdef.Listen -#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item +#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item #define SID_SCVIEWOPTIONS (SC_VIEW_START + 39) #define SID_SCDOCOPTIONS (SC_VIEW_START + 40) // Cursorbewegungen als Properties: -#define SID_CURRENTCELL (SC_VIEW_START + 41) -#define SID_CURRENTTAB (SC_VIEW_START + 42) -#define SID_CURRENTDOC (SC_VIEW_START + 43) -#define SID_CURRENTOBJECT (SC_VIEW_START + 44) +#define SID_CURRENTCELL (SC_VIEW_START + 41) +#define SID_CURRENTTAB (SC_VIEW_START + 42) +#define SID_CURRENTDOC (SC_VIEW_START + 43) +#define SID_CURRENTOBJECT (SC_VIEW_START + 44) // Slot-IDs fuer spez. ToolBox-Funktionen: -#define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) -#define SID_NUMBER_PERCENT (SC_VIEW_START + 46) +#define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) +#define SID_NUMBER_PERCENT (SC_VIEW_START + 46) // "Slot" Ids fuer Eingabezeilen Images: -#define SID_INPUT_FUNCTION (SC_VIEW_START + 47) -#define SID_INPUT_SUM (SC_VIEW_START + 48) -#define SID_INPUT_EQUAL (SC_VIEW_START + 49) -#define SID_INPUT_CANCEL (SC_VIEW_START + 50) -#define SID_INPUT_OK (SC_VIEW_START + 51) - -#define SID_NUMBER_STANDARD (SC_VIEW_START + 52) -#define SID_NUMBER_DATE (SC_VIEW_START + 53) -#define SID_NUMBER_TWODEC (SC_VIEW_START + 54) -#define SID_NUMBER_SCIENTIFIC (SC_VIEW_START + 55) -#define SID_NUMBER_TIME (SC_VIEW_START + 56) -#define SID_NUMBER_INCDEC (SC_VIEW_START + 57) -#define SID_NUMBER_DECDEC (SC_VIEW_START + 58) +#define SID_INPUT_FUNCTION (SC_VIEW_START + 47) +#define SID_INPUT_SUM (SC_VIEW_START + 48) +#define SID_INPUT_EQUAL (SC_VIEW_START + 49) +#define SID_INPUT_CANCEL (SC_VIEW_START + 50) +#define SID_INPUT_OK (SC_VIEW_START + 51) + +#define SID_NUMBER_STANDARD (SC_VIEW_START + 52) +#define SID_NUMBER_DATE (SC_VIEW_START + 53) +#define SID_NUMBER_TWODEC (SC_VIEW_START + 54) +#define SID_NUMBER_SCIENTIFIC (SC_VIEW_START + 55) +#define SID_NUMBER_TIME (SC_VIEW_START + 56) +#define SID_NUMBER_INCDEC (SC_VIEW_START + 57) +#define SID_NUMBER_DECDEC (SC_VIEW_START + 58) // Sonstiges: -#define SID_LINKS (SC_VIEW_START + 60) -#define SID_INSERT_SIMAGE (SC_VIEW_START + 61) -#define SID_INSERT_SCHART (SC_VIEW_START + 62) +#define SID_LINKS (SC_VIEW_START + 60) +#define SID_INSERT_SIMAGE (SC_VIEW_START + 61) +#define SID_INSERT_SCHART (SC_VIEW_START + 62) #define SID_INSERT_SMATH (SC_VIEW_START + 63) -#define SID_STANDARD_FONTS (SC_VIEW_START + 64) -#define SID_MIRROR_VERTICAL (SC_VIEW_START + 65) -#define SID_MIRROR_HORIZONTAL (SC_VIEW_START + 66) -#define SID_CELL_FORMAT_RESET (SC_VIEW_START + 67) +#define SID_STANDARD_FONTS (SC_VIEW_START + 64) +#define SID_MIRROR_VERTICAL (SC_VIEW_START + 65) +#define SID_MIRROR_HORIZONTAL (SC_VIEW_START + 66) +#define SID_CELL_FORMAT_RESET (SC_VIEW_START + 67) #define SID_SCPRINTOPTIONS (SC_VIEW_START + 68) -#define SID_WINDOW_SPLIT (SC_VIEW_START + 69) -#define SID_WINDOW_FIX (SC_VIEW_START + 70) +#define SID_WINDOW_SPLIT (SC_VIEW_START + 69) +#define SID_WINDOW_FIX (SC_VIEW_START + 70) #ifdef SID_DRAW_CHART #undef SID_DRAW_CHART #endif -#define SID_DRAW_CHART (SC_VIEW_START + 71) -#define SID_UPDATETABLINKS (SC_VIEW_START + 72) +#define SID_DRAW_CHART (SC_VIEW_START + 71) +#define SID_UPDATETABLINKS (SC_VIEW_START + 72) //TabPage Eingabe #define SID_SC_INPUT_SELECTION (SC_VIEW_START + 73) @@ -558,23 +558,23 @@ #define SID_SC_INPUT_EDITMODE (SC_VIEW_START + 75) #define SID_SC_INPUT_FMT_EXPAND (SC_VIEW_START + 76) #define SID_SC_INPUT_RANGEFINDER (SC_VIEW_START + 77) -#define SID_SC_INPUT_REF_EXPAND (SC_VIEW_START + 78) -#define SID_SC_INPUT_MARK_HEADER (SC_VIEW_START + 79) +#define SID_SC_INPUT_REF_EXPAND (SC_VIEW_START + 78) +#define SID_SC_INPUT_MARK_HEADER (SC_VIEW_START + 79) -#define SID_REIMPORT_AFTER_LOAD (SC_VIEW_START + 80) -#define SID_DRAW_NOTEEDIT (SC_VIEW_START + 81) +#define SID_REIMPORT_AFTER_LOAD (SC_VIEW_START + 80) +#define SID_DRAW_NOTEEDIT (SC_VIEW_START + 81) -#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) -#define SID_EURO_CONVERTER (SC_VIEW_START + 83) -//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX +#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) +#define SID_EURO_CONVERTER (SC_VIEW_START + 83) +//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85) -#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86) +#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86) #define SID_ENABLE_HYPHENATION (SC_VIEW_START + 87) -#define SID_RENAME_OBJECT (SC_VIEW_START + 88) -#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89) +#define SID_RENAME_OBJECT (SC_VIEW_START + 88) +#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89) #define SID_SELECT_TABLES (SC_VIEW_START + 90) // #97776# new entry "Filter..." in DP popup menu @@ -587,7 +587,7 @@ #define FID_VALID_LISTTYPE (SC_VIEW_START + 93) // #i68101# ID for changing Title & Descriptopn of an Object -#define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94) +#define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94) // #i59082# assign macro to shape #define SID_ASSIGNMACRO (SC_VIEW_START + 95) @@ -605,23 +605,23 @@ // Nachrichten ------------------------------------------------------------- -#define FID_INPUTLINE_STATUS (SC_MESSAGE_START) -#define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1) -#define FID_REPAINT (SC_MESSAGE_START + 2) -#define FID_DATACHANGED (SC_MESSAGE_START + 3) -#define FID_REFMODECHANGED (SC_MESSAGE_START + 4) -#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5) +#define FID_INPUTLINE_STATUS (SC_MESSAGE_START) +#define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1) +#define FID_REPAINT (SC_MESSAGE_START + 2) +#define FID_DATACHANGED (SC_MESSAGE_START + 3) +#define FID_REFMODECHANGED (SC_MESSAGE_START + 4) +#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5) #define SID_SOLVE (SC_MESSAGE_START + 6) #define FID_FONT_SELECTED (SC_MESSAGE_START + 7) #define FID_FILTER_OK (SC_MESSAGE_START + 8) -#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9) -#define SID_TABDELETED (SC_MESSAGE_START + 10) -#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11) +#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9) +#define SID_TABDELETED (SC_MESSAGE_START + 10) +#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11) #define SID_DLG_RETOK (SC_MESSAGE_START + 12) -#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13) +#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13) #define SID_STATUS_DOCPOS (SC_MESSAGE_START + 14) #define SID_STATUS_PAGESTYLE (SC_MESSAGE_START + 15) -#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16) +#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16) #define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17) #define SID_DLG_MATRIX (SC_MESSAGE_START + 18) #define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19) @@ -632,256 +632,256 @@ #define SID_STATUS_SELMODE_ERW (SC_MESSAGE_START + 23) #define SID_STATUS_SELMODE_NORM (SC_MESSAGE_START + 24) -#define SID_CHART_SOURCE (SC_MESSAGE_START + 25) -#define SID_CHART_NAME (SC_MESSAGE_START + 26) -#define SID_CHART_ADDSOURCE (SC_MESSAGE_START + 27) +#define SID_CHART_SOURCE (SC_MESSAGE_START + 25) +#define SID_CHART_NAME (SC_MESSAGE_START + 26) +#define SID_CHART_ADDSOURCE (SC_MESSAGE_START + 27) -#define SID_AUTO_STYLE (SC_MESSAGE_START + 28) +#define SID_AUTO_STYLE (SC_MESSAGE_START + 28) -#define FID_INPUTLINE_BLOCK (SC_MESSAGE_START + 29) +#define FID_INPUTLINE_BLOCK (SC_MESSAGE_START + 29) -#define SID_STATUS_SUM (SC_MESSAGE_START + 30) +#define SID_STATUS_SUM (SC_MESSAGE_START + 30) -#define SC_HINT_DRAW_CHANGED (SC_MESSAGE_START + 31) -#define SC_HINT_DOCNAME_CHANGED (SC_MESSAGE_START + 32) +#define SC_HINT_DRAW_CHANGED (SC_MESSAGE_START + 31) +#define SC_HINT_DOCNAME_CHANGED (SC_MESSAGE_START + 32) #define SC_HINT_AREALINKS_CHANGED (SC_MESSAGE_START + 33) -#define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) -#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) -#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) +#define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) +#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) +#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) // Nachricht zum Oeffnen von Dialogen: -#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) -#define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51) -#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52) -#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53) -#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54) -//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55) -#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56) -#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57) -//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58) -#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59) +#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) +#define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51) +#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52) +#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53) +#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54) +//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55) +#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56) +#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57) +//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58) +#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59) #define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60) //Added by PengYunQuan for Validity Cell Range Picker #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) // Funktionen ------------------------------------------------------------ -//#define FID_PRINT_PREVIEW (SC_FUNCTION_START) -#define FID_DOC_MANAGER (SC_FUNCTION_START + 1) -#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) +//#define FID_PRINT_PREVIEW (SC_FUNCTION_START) +#define FID_DOC_MANAGER (SC_FUNCTION_START + 1) +#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) #define SID_MAIL (SC_FUNCTION_START + 3) -#define FILE_MENU_END (SC_FUNCTION_START + 20) - -#define EDIT_MENU_START (FILE_MENU_END) -#define FID_DELETE_CELLCONTENTS (EDIT_MENU_START + 1) -#define FID_DELETE_CELL (EDIT_MENU_START + 2) -#define FID_DELETE_TABLE (EDIT_MENU_START + 3) -#define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) -#define FID_FILL_TO_RIGHT (EDIT_MENU_START + 5) -#define FID_FILL_TO_TOP (EDIT_MENU_START + 6) -#define FID_FILL_TO_LEFT (EDIT_MENU_START + 7) -#define FID_FILL_TAB (EDIT_MENU_START + 8) -#define FID_FILL_SERIES (EDIT_MENU_START + 9) -#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10) -#define FID_EDIT_OBJECT (EDIT_MENU_START + 11) -#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12) -#define SID_SC_WIZARD (EDIT_MENU_START + 13) -#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14) +#define FILE_MENU_END (SC_FUNCTION_START + 20) + +#define EDIT_MENU_START (FILE_MENU_END) +#define FID_DELETE_CELLCONTENTS (EDIT_MENU_START + 1) +#define FID_DELETE_CELL (EDIT_MENU_START + 2) +#define FID_DELETE_TABLE (EDIT_MENU_START + 3) +#define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) +#define FID_FILL_TO_RIGHT (EDIT_MENU_START + 5) +#define FID_FILL_TO_TOP (EDIT_MENU_START + 6) +#define FID_FILL_TO_LEFT (EDIT_MENU_START + 7) +#define FID_FILL_TAB (EDIT_MENU_START + 8) +#define FID_FILL_SERIES (EDIT_MENU_START + 9) +#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10) +#define FID_EDIT_OBJECT (EDIT_MENU_START + 11) +#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12) +#define SID_SC_WIZARD (EDIT_MENU_START + 13) +#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14) #define SID_HFEDIT (EDIT_MENU_START + 15) #define SID_DEL_ROWS (EDIT_MENU_START + 16)//JN #define SID_DEL_COLS (EDIT_MENU_START + 17)//JN -//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -> moved to SVX -#define FID_CHG_SHOW (EDIT_MENU_START + 19) +//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -> moved to SVX +#define FID_CHG_SHOW (EDIT_MENU_START + 19) -#define EDIT_MENU_END (EDIT_MENU_START + 20) -#define VIEW_MENU_START (EDIT_MENU_END) +#define EDIT_MENU_END (EDIT_MENU_START + 20) +#define VIEW_MENU_START (EDIT_MENU_END) -#define FID_TOGGLEOBJECT (VIEW_MENU_START) -#define FID_TOGGLEINPUTLINE (VIEW_MENU_START + 1) -#define FID_TOGGLEHEADERS (VIEW_MENU_START + 2) -#define FID_SCALE (VIEW_MENU_START + 4) -#define FID_TOGGLESYNTAX (VIEW_MENU_START + 5) -#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6) -#define FID_PAGEBREAKMODE (VIEW_MENU_START + 7) -#define FID_FUNCTION_BOX (VIEW_MENU_START + 8) +#define FID_TOGGLEOBJECT (VIEW_MENU_START) +#define FID_TOGGLEINPUTLINE (VIEW_MENU_START + 1) +#define FID_TOGGLEHEADERS (VIEW_MENU_START + 2) +#define FID_SCALE (VIEW_MENU_START + 4) +#define FID_TOGGLESYNTAX (VIEW_MENU_START + 5) +#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6) +#define FID_PAGEBREAKMODE (VIEW_MENU_START + 7) +#define FID_FUNCTION_BOX (VIEW_MENU_START + 8) #define FID_NORMALVIEWMODE (VIEW_MENU_START + 9) -#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10) +#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10) // Compare/Merge jetzt aus Sfx -//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID -//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER DIRTY ID -#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID -#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER DIRTY ID -#define VIEW_MENU_END (VIEW_MENU_START + 20) - -#define INSERT_MENU_START (VIEW_MENU_END) -#define FID_PAGEBREAK (INSERT_MENU_START) -#define FID_INS_ROWBRK (INSERT_MENU_START + 1) -#define FID_INS_COLBRK (INSERT_MENU_START + 2) -#define FID_DEL_ROWBRK (INSERT_MENU_START + 3) -#define FID_DEL_COLBRK (INSERT_MENU_START + 4) -#define FID_INS_CELL_CONTENTS (INSERT_MENU_START + 5) -#define FID_INS_CELL (INSERT_MENU_START + 6) -#define FID_INS_ROW (INSERT_MENU_START + 7) -#define FID_INS_COLUMN (INSERT_MENU_START + 8) -#define FID_INS_TABLE (INSERT_MENU_START + 9) -#define SID_INS_FUNCTION (INSERT_MENU_START + 10) -#define FID_DEFINE_NAME (INSERT_MENU_START + 11) -#define FID_INSERT_NAME (INSERT_MENU_START + 12) -#define FID_USE_NAME (INSERT_MENU_START + 13) -#define FID_APPLY_NAME (INSERT_MENU_START + 14) +//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID +//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER DIRTY ID +#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID +#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER DIRTY ID +#define VIEW_MENU_END (VIEW_MENU_START + 20) + +#define INSERT_MENU_START (VIEW_MENU_END) +#define FID_PAGEBREAK (INSERT_MENU_START) +#define FID_INS_ROWBRK (INSERT_MENU_START + 1) +#define FID_INS_COLBRK (INSERT_MENU_START + 2) +#define FID_DEL_ROWBRK (INSERT_MENU_START + 3) +#define FID_DEL_COLBRK (INSERT_MENU_START + 4) +#define FID_INS_CELL_CONTENTS (INSERT_MENU_START + 5) +#define FID_INS_CELL (INSERT_MENU_START + 6) +#define FID_INS_ROW (INSERT_MENU_START + 7) +#define FID_INS_COLUMN (INSERT_MENU_START + 8) +#define FID_INS_TABLE (INSERT_MENU_START + 9) +#define SID_INS_FUNCTION (INSERT_MENU_START + 10) +#define FID_DEFINE_NAME (INSERT_MENU_START + 11) +#define FID_INSERT_NAME (INSERT_MENU_START + 12) +#define FID_USE_NAME (INSERT_MENU_START + 13) +#define FID_APPLY_NAME (INSERT_MENU_START + 14) #define FID_INS_TABLE_EXT (INSERT_MENU_START + 15) -//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!! kommt von sfx +//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!! kommt von sfx //aus sfx: #define SID_INSERT_POSTIT (INSERT_MENU_START + 16) #define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen -#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) -#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) -#define INSERT_MENU_END (INSERT_MENU_START + 20) - -#define FORMAT_MENU_START (INSERT_MENU_END) -#define FID_CELL_FORMAT (FORMAT_MENU_START) -#define FID_ROW_HEIGHT (FORMAT_MENU_START + 1) -#define FID_ROW_OPT_HEIGHT (FORMAT_MENU_START + 2) -#define FID_ROW_HIDE (FORMAT_MENU_START + 3) -#define FID_ROW_SHOW (FORMAT_MENU_START + 4) -#define FID_COL_WIDTH (FORMAT_MENU_START + 5) -#define FID_COL_OPT_WIDTH (FORMAT_MENU_START + 6) -#define FID_COL_HIDE (FORMAT_MENU_START + 7) -#define FID_COL_SHOW (FORMAT_MENU_START + 8) -#define FID_TABLE_HIDE (FORMAT_MENU_START + 9) -#define FID_TABLE_SHOW (FORMAT_MENU_START + 10) -#define FID_CONDITIONAL_FORMAT (FORMAT_MENU_START + 11) -#define SID_SCSTYLES (FORMAT_MENU_START + 12) -#define FID_MERGE_ON (FORMAT_MENU_START + 13) -#define FID_MERGE_OFF (FORMAT_MENU_START + 14) +#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) +#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) +#define INSERT_MENU_END (INSERT_MENU_START + 20) + +#define FORMAT_MENU_START (INSERT_MENU_END) +#define FID_CELL_FORMAT (FORMAT_MENU_START) +#define FID_ROW_HEIGHT (FORMAT_MENU_START + 1) +#define FID_ROW_OPT_HEIGHT (FORMAT_MENU_START + 2) +#define FID_ROW_HIDE (FORMAT_MENU_START + 3) +#define FID_ROW_SHOW (FORMAT_MENU_START + 4) +#define FID_COL_WIDTH (FORMAT_MENU_START + 5) +#define FID_COL_OPT_WIDTH (FORMAT_MENU_START + 6) +#define FID_COL_HIDE (FORMAT_MENU_START + 7) +#define FID_COL_SHOW (FORMAT_MENU_START + 8) +#define FID_TABLE_HIDE (FORMAT_MENU_START + 9) +#define FID_TABLE_SHOW (FORMAT_MENU_START + 10) +#define FID_CONDITIONAL_FORMAT (FORMAT_MENU_START + 11) +#define SID_SCSTYLES (FORMAT_MENU_START + 12) +#define FID_MERGE_ON (FORMAT_MENU_START + 13) +#define FID_MERGE_OFF (FORMAT_MENU_START + 14) #define SID_FORMATPAGE (FORMAT_MENU_START + 15) #define SID_TEXT_STANDARD (FORMAT_MENU_START + 16) -#define SID_DRAWTEXT_ATTR_DLG (FORMAT_MENU_START + 17) -#define FID_TABLE_VISIBLE (FORMAT_MENU_START + 18) -#define FID_COL_OPT_DIRECT (FORMAT_MENU_START + 19) -#define FORMAT_MENU_END (FORMAT_MENU_START + 20) +#define SID_DRAWTEXT_ATTR_DLG (FORMAT_MENU_START + 17) +#define FID_TABLE_VISIBLE (FORMAT_MENU_START + 18) +#define FID_COL_OPT_DIRECT (FORMAT_MENU_START + 19) +#define FORMAT_MENU_END (FORMAT_MENU_START + 20) -#define EXTRA_MENU_START (FORMAT_MENU_END) -#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1) +#define EXTRA_MENU_START (FORMAT_MENU_END) +#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1) #define SID_RECALC_TITLE (EXTRA_MENU_START + 2) -#define FID_AUTO_CALC (EXTRA_MENU_START + 3) -#define FID_RECALC (EXTRA_MENU_START + 4) -#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5) -#define FID_PROTECT_TABLE (EXTRA_MENU_START + 6) -#define FID_PROTECT_DOC (EXTRA_MENU_START + 7) -#define SID_EDIT_MACRO (EXTRA_MENU_START + 8) -#define SID_SCOPTIONS (EXTRA_MENU_START + 9) -#define SID_MACRO_CHOOSER (EXTRA_MENU_START + 10) +#define FID_AUTO_CALC (EXTRA_MENU_START + 3) +#define FID_RECALC (EXTRA_MENU_START + 4) +#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5) +#define FID_PROTECT_TABLE (EXTRA_MENU_START + 6) +#define FID_PROTECT_DOC (EXTRA_MENU_START + 7) +#define SID_EDIT_MACRO (EXTRA_MENU_START + 8) +#define SID_SCOPTIONS (EXTRA_MENU_START + 9) +#define SID_MACRO_CHOOSER (EXTRA_MENU_START + 10) #define SID_SHARE_DOC (EXTRA_MENU_START + 11) -#define SID_SCENARIOS (EXTRA_MENU_START + 12) -#define SID_ADD_IN_MANAGER (EXTRA_MENU_START + 13) +#define SID_SCENARIOS (EXTRA_MENU_START + 12) +#define SID_ADD_IN_MANAGER (EXTRA_MENU_START + 13) #define SID_PIVOT_RECALC (EXTRA_MENU_START + 14) #define SID_PIVOT_KILL (EXTRA_MENU_START + 15) // hier falsch, aber erstmal -#define SID_SC_HELP_PI (EXTRA_MENU_START + 16) +#define SID_SC_HELP_PI (EXTRA_MENU_START + 16) #define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17) -#define FID_HARD_RECALC (EXTRA_MENU_START + 18) -#define FID_AUTOCOMPLETE (EXTRA_MENU_START + 19) +#define FID_HARD_RECALC (EXTRA_MENU_START + 18) +#define FID_AUTOCOMPLETE (EXTRA_MENU_START + 19) -#define EXTRA_MENU_END (EXTRA_MENU_START + 20) +#define EXTRA_MENU_END (EXTRA_MENU_START + 20) -#define DATA_MENU_START (EXTRA_MENU_END) -#define SID_DEFINE_DBNAME (DATA_MENU_START) -#define SID_SELECT_DB (DATA_MENU_START + 1) +#define DATA_MENU_START (EXTRA_MENU_END) +#define SID_DEFINE_DBNAME (DATA_MENU_START) +#define SID_SELECT_DB (DATA_MENU_START + 1) #define SID_SORT (DATA_MENU_START + 2) #define SID_FILTER (DATA_MENU_START + 3) #define SID_SPECIAL_FILTER (DATA_MENU_START + 4) #define SID_AUTO_FILTER (DATA_MENU_START + 5) -#define SID_UNFILTER (DATA_MENU_START + 6) +#define SID_UNFILTER (DATA_MENU_START + 6) #define SID_QUERY (DATA_MENU_START + 7) #define SID_SUBTOTALS (DATA_MENU_START + 8) //aus sfx: #define SID_OUTLINE_HIDE (DATA_MENU_START + 9) //aus sfx: #define SID_OUTLINE_SHOW (DATA_MENU_START + 10) //aus sfx: #define SID_OUTLINE_MAKE (DATA_MENU_START + 11) //aus sfx: #define SID_OUTLINE_REMOVE (DATA_MENU_START + 12) -#define SID_AUTO_OUTLINE (DATA_MENU_START + 13) +#define SID_AUTO_OUTLINE (DATA_MENU_START + 13) //aus sfx: #define SID_OUTLINE_DELETEALL (DATA_MENU_START + 14) #define SID_IMPORT_DATA (DATA_MENU_START + 15) #define SID_REIMPORT_DATA (DATA_MENU_START + 16) -#define SID_PIVOT_TABLE (DATA_MENU_START + 17) -#define SID_TABOP (DATA_MENU_START + 18) -#define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) -#define SID_CONSOLIDATE (DATA_MENU_START + 20) -#define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) +#define SID_PIVOT_TABLE (DATA_MENU_START + 17) +#define SID_TABOP (DATA_MENU_START + 18) +#define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) +#define SID_CONSOLIDATE (DATA_MENU_START + 20) +#define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) -#define SID_SBA_IMPORT (DATA_MENU_START + 22) +#define SID_SBA_IMPORT (DATA_MENU_START + 22) -#define SID_SORT_DESCENDING (DATA_MENU_START + 23) -#define SID_SORT_ASCENDING (DATA_MENU_START + 24) +#define SID_SORT_DESCENDING (DATA_MENU_START + 23) +#define SID_SORT_ASCENDING (DATA_MENU_START + 24) // // #define DATA_MENU_END (DATA_MENU_START + 25) -#define TAB_POPUP_START (DATA_MENU_END) -#define RID_POPUP_TAB (TAB_POPUP_START) -#define FID_TAB_MENU_RENAME (TAB_POPUP_START+1) -#define FID_TAB_RENAME (TAB_POPUP_START+2) -#define FID_TAB_MOVE (TAB_POPUP_START+3) -#define FID_TAB_SELECTALL (TAB_POPUP_START+4) -#define FID_TAB_APPEND (TAB_POPUP_START+5) -#define FID_TAB_INDEX (TAB_POPUP_START+6) -#define FID_TAB_RTL (TAB_POPUP_START+7) +#define TAB_POPUP_START (DATA_MENU_END) +#define RID_POPUP_TAB (TAB_POPUP_START) +#define FID_TAB_MENU_RENAME (TAB_POPUP_START+1) +#define FID_TAB_RENAME (TAB_POPUP_START+2) +#define FID_TAB_MOVE (TAB_POPUP_START+3) +#define FID_TAB_SELECTALL (TAB_POPUP_START+4) +#define FID_TAB_APPEND (TAB_POPUP_START+5) +#define FID_TAB_INDEX (TAB_POPUP_START+6) +#define FID_TAB_RTL (TAB_POPUP_START+7) #define FID_TAB_DESELECTALL (TAB_POPUP_START+8) #define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9) #define FID_TAB_SET_TAB_BG_COLOR (TAB_POPUP_START + 10) #define FID_TAB_EVENTS (TAB_POPUP_START+11) -#define TAB_POPUP_END (TAB_POPUP_START + 20) - -#define OBJBAR_FORMAT_START (TAB_POPUP_END) -#define SID_ALIGNLEFT (OBJBAR_FORMAT_START+6) -#define SID_ALIGNRIGHT (OBJBAR_FORMAT_START+7) -#define SID_ALIGNCENTERHOR (OBJBAR_FORMAT_START+8) -#define SID_ALIGNBLOCK (OBJBAR_FORMAT_START+9) -#define SID_ALIGNTOP (OBJBAR_FORMAT_START+10) -#define SID_ALIGNBOTTOM (OBJBAR_FORMAT_START+11) -#define SID_ALIGNCENTERVER (OBJBAR_FORMAT_START+12) -#define SID_SELECT_SCENARIO (OBJBAR_FORMAT_START+13) - -#define SID_V_ALIGNCELL (OBJBAR_FORMAT_START+14) -#define SID_H_ALIGNCELL (OBJBAR_FORMAT_START+15) - -#define OBJBAR_FORMAT_END (OBJBAR_FORMAT_START+20) - -#define RID_INPUTBAR_START (OBJBAR_FORMAT_END) -#define SID_INPUT_WINDOW (RID_INPUTBAR_START) -#define RID_INPUTBAR_END (RID_INPUTBAR_START+1) - -#define DRAW_BAR_START (RID_INPUTBAR_END) -#define SID_DRAWTOABOVE (DRAW_BAR_START+15) -#define SID_DRAWTOBELOW (DRAW_BAR_START+16) -//#define SID_GROUP (DRAW_BAR_START+17) -//#define SID_UNGROUP (DRAW_BAR_START+18) -#define SID_FRAMETOTOP (DRAW_BAR_START+19) -#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20) -//aus sfx: #define SID_FRAME_UP (DRAW_BAR_START+21) -//aus sfx: #define SID_FRAME_DOWN (DRAW_BAR_START+22) +#define TAB_POPUP_END (TAB_POPUP_START + 20) + +#define OBJBAR_FORMAT_START (TAB_POPUP_END) +#define SID_ALIGNLEFT (OBJBAR_FORMAT_START+6) +#define SID_ALIGNRIGHT (OBJBAR_FORMAT_START+7) +#define SID_ALIGNCENTERHOR (OBJBAR_FORMAT_START+8) +#define SID_ALIGNBLOCK (OBJBAR_FORMAT_START+9) +#define SID_ALIGNTOP (OBJBAR_FORMAT_START+10) +#define SID_ALIGNBOTTOM (OBJBAR_FORMAT_START+11) +#define SID_ALIGNCENTERVER (OBJBAR_FORMAT_START+12) +#define SID_SELECT_SCENARIO (OBJBAR_FORMAT_START+13) + +#define SID_V_ALIGNCELL (OBJBAR_FORMAT_START+14) +#define SID_H_ALIGNCELL (OBJBAR_FORMAT_START+15) + +#define OBJBAR_FORMAT_END (OBJBAR_FORMAT_START+20) + +#define RID_INPUTBAR_START (OBJBAR_FORMAT_END) +#define SID_INPUT_WINDOW (RID_INPUTBAR_START) +#define RID_INPUTBAR_END (RID_INPUTBAR_START+1) + +#define DRAW_BAR_START (RID_INPUTBAR_END) +#define SID_DRAWTOABOVE (DRAW_BAR_START+15) +#define SID_DRAWTOBELOW (DRAW_BAR_START+16) +//#define SID_GROUP (DRAW_BAR_START+17) +//#define SID_UNGROUP (DRAW_BAR_START+18) +#define SID_FRAMETOTOP (DRAW_BAR_START+19) +#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20) +//aus sfx: #define SID_FRAME_UP (DRAW_BAR_START+21) +//aus sfx: #define SID_FRAME_DOWN (DRAW_BAR_START+22) #define SID_TOOL_TEXT (DRAW_BAR_START+23) #define SID_ANCHOR_PAGE (DRAW_BAR_START+24) #define SID_ANCHOR_CELL (DRAW_BAR_START+25) #define SID_ANCHOR_TOGGLE (DRAW_BAR_START+26) -#define SID_ORIGINALSIZE (DRAW_BAR_START+27) +#define SID_ORIGINALSIZE (DRAW_BAR_START+27) -#define DRAW_BAR_END (DRAW_BAR_START+50) +#define DRAW_BAR_END (DRAW_BAR_START+50) -#define DRAWTEXTBAR_START (DRAW_BAR_END) -#define SID_TEXT_LINESPACING_1 (DRAWTEXTBAR_START) -#define SID_TEXT_LINESPACING_2 (DRAWTEXTBAR_START+1) -#define SID_TEXT_LINESPACING_3 (DRAWTEXTBAR_START+2) -#define DRAWTEXTBAR_END (DRAWTEXTBAR_START+20) +#define DRAWTEXTBAR_START (DRAW_BAR_END) +#define SID_TEXT_LINESPACING_1 (DRAWTEXTBAR_START) +#define SID_TEXT_LINESPACING_2 (DRAWTEXTBAR_START+1) +#define SID_TEXT_LINESPACING_3 (DRAWTEXTBAR_START+2) +#define DRAWTEXTBAR_END (DRAWTEXTBAR_START+20) -#define DETECTIVE_START (DRAWTEXTBAR_END) +#define DETECTIVE_START (DRAWTEXTBAR_END) #define SID_DETECTIVE_ADD_PRED (DETECTIVE_START) #define SID_DETECTIVE_DEL_PRED (DETECTIVE_START+1) #define SID_DETECTIVE_ADD_SUCC (DETECTIVE_START+2) @@ -889,313 +889,313 @@ #define SID_DETECTIVE_ADD_ERR (DETECTIVE_START+4) #define SID_DETECTIVE_DEL_ALL (DETECTIVE_START+5) -#define SID_DETECTIVE_FILLMODE (DETECTIVE_START+6) -#define SID_FILL_ADD_PRED (DETECTIVE_START+7) -#define SID_FILL_DEL_PRED (DETECTIVE_START+8) -#define SID_FILL_ADD_SUCC (DETECTIVE_START+9) -#define SID_FILL_DEL_SUCC (DETECTIVE_START+10) -#define SID_FILL_NONE (DETECTIVE_START+11) -#define SID_FILL_SELECT (DETECTIVE_START+12) +#define SID_DETECTIVE_FILLMODE (DETECTIVE_START+6) +#define SID_FILL_ADD_PRED (DETECTIVE_START+7) +#define SID_FILL_DEL_PRED (DETECTIVE_START+8) +#define SID_FILL_ADD_SUCC (DETECTIVE_START+9) +#define SID_FILL_DEL_SUCC (DETECTIVE_START+10) +#define SID_FILL_NONE (DETECTIVE_START+11) +#define SID_FILL_SELECT (DETECTIVE_START+12) #define SID_DETECTIVE_INVALID (DETECTIVE_START+13) #define SID_DETECTIVE_REFRESH (DETECTIVE_START+14) #define SID_DETECTIVE_AUTO (DETECTIVE_START+15) -#define DETECTIVE_END (DETECTIVE_START+20) +#define DETECTIVE_END (DETECTIVE_START+20) -#define SID_API_SLOTS (DETECTIVE_END) -//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS) -#define SID_INSERT_MATRIX (SID_API_SLOTS+1) +#define SID_API_SLOTS (DETECTIVE_END) +//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS) +#define SID_INSERT_MATRIX (SID_API_SLOTS+1) #define SID_DELETE_NOTE (SID_API_SLOTS+2) -#define SID_PREVIEW_START (SID_API_SLOTS+20) -#define SID_PREVIEW_NEXT (SID_PREVIEW_START) -#define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) -#define SID_PREVIEW_FIRST (SID_PREVIEW_START+2) -#define SID_PREVIEW_LAST (SID_PREVIEW_START+3) -#define SID_PREVIEW_GOTO (SID_PREVIEW_START+4) -#define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5) -#define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6) -#define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) +#define SID_PREVIEW_START (SID_API_SLOTS+20) +#define SID_PREVIEW_NEXT (SID_PREVIEW_START) +#define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) +#define SID_PREVIEW_FIRST (SID_PREVIEW_START+2) +#define SID_PREVIEW_LAST (SID_PREVIEW_START+3) +#define SID_PREVIEW_GOTO (SID_PREVIEW_START+4) +#define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5) +#define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6) +#define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) #define SID_PREVIEW_MARGIN (SID_PREVIEW_START+8) #define SID_PREVIEW_SCALINGFACTOR (SID_PREVIEW_START+9) -#define SID_PREVIEW_END (SID_PREVIEW_START+20) - -//aus sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) -#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) -#define SID_CURSORUP_SEL (SID_KEYFUNC_START + 1) -#define SID_CURSORLEFT_SEL (SID_KEYFUNC_START + 2) -#define SID_CURSORRIGHT_SEL (SID_KEYFUNC_START + 3) -#define SID_CURSORPAGEDOWN_SEL (SID_KEYFUNC_START + 4) -#define SID_CURSORPAGEUP_SEL (SID_KEYFUNC_START + 5) - -#define SID_CURSORPAGELEFT_ (SID_KEYFUNC_START + 6) -#define SID_CURSORPAGELEFT_SEL (SID_KEYFUNC_START + 7) -#define SID_CURSORPAGERIGHT_ (SID_KEYFUNC_START + 8) -#define SID_CURSORPAGERIGHT_SEL (SID_KEYFUNC_START + 9) - -#define SID_CURSORTOPOFFILE_SEL (SID_KEYFUNC_START + 10) -#define SID_CURSORENDOFFILE_SEL (SID_KEYFUNC_START + 11) -#define SID_CURSORHOME_SEL (SID_KEYFUNC_START + 12) -#define SID_CURSOREND_SEL (SID_KEYFUNC_START + 13) -#define SID_CURSORBLKUP (SID_KEYFUNC_START + 14) -#define SID_CURSORBLKDOWN (SID_KEYFUNC_START + 15) -#define SID_CURSORBLKLEFT (SID_KEYFUNC_START + 16) -#define SID_CURSORBLKRIGHT (SID_KEYFUNC_START + 17) -#define SID_CURSORBLKUP_SEL (SID_KEYFUNC_START + 18) -#define SID_CURSORBLKDOWN_SEL (SID_KEYFUNC_START + 19) -#define SID_CURSORBLKLEFT_SEL (SID_KEYFUNC_START + 20) -#define SID_CURSORBLKRIGHT_SEL (SID_KEYFUNC_START + 21) - -#define SID_NEXT_TABLE (SID_KEYFUNC_START + 22) -#define SID_PREV_TABLE (SID_KEYFUNC_START + 23) - -#define SID_NEXT_UNPROTECT (SID_KEYFUNC_START + 24) -#define SID_PREV_UNPROTECT (SID_KEYFUNC_START + 25) - -#define SID_SELECT_COL (SID_KEYFUNC_START + 26) -#define SID_SELECT_ROW (SID_KEYFUNC_START + 27) -#define SID_SELECT_NONE (SID_KEYFUNC_START + 28) -#define SID_ALIGNCURSOR (SID_KEYFUNC_START + 29) -#define SID_MARKDATAAREA (SID_KEYFUNC_START + 30) -#define SID_SETINPUTMODE (SID_KEYFUNC_START + 31) -#define SID_DELETE_CONTENTS (SID_KEYFUNC_START + 32) - -#define SID_MARKAREA (SID_KEYFUNC_START + 33) - -#define SID_AUTOFILL (SID_KEYFUNC_START + 34) -#define FID_FILL_AUTO (SID_KEYFUNC_START + 35) -#define SID_CANCEL (SID_KEYFUNC_START + 36) - -#define SID_CURSORENTERUP (SID_KEYFUNC_START + 37) -#define SID_CURSORENTERDOWN (SID_KEYFUNC_START + 38) +#define SID_PREVIEW_END (SID_PREVIEW_START+20) + +//aus sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) +#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) +#define SID_CURSORUP_SEL (SID_KEYFUNC_START + 1) +#define SID_CURSORLEFT_SEL (SID_KEYFUNC_START + 2) +#define SID_CURSORRIGHT_SEL (SID_KEYFUNC_START + 3) +#define SID_CURSORPAGEDOWN_SEL (SID_KEYFUNC_START + 4) +#define SID_CURSORPAGEUP_SEL (SID_KEYFUNC_START + 5) + +#define SID_CURSORPAGELEFT_ (SID_KEYFUNC_START + 6) +#define SID_CURSORPAGELEFT_SEL (SID_KEYFUNC_START + 7) +#define SID_CURSORPAGERIGHT_ (SID_KEYFUNC_START + 8) +#define SID_CURSORPAGERIGHT_SEL (SID_KEYFUNC_START + 9) + +#define SID_CURSORTOPOFFILE_SEL (SID_KEYFUNC_START + 10) +#define SID_CURSORENDOFFILE_SEL (SID_KEYFUNC_START + 11) +#define SID_CURSORHOME_SEL (SID_KEYFUNC_START + 12) +#define SID_CURSOREND_SEL (SID_KEYFUNC_START + 13) +#define SID_CURSORBLKUP (SID_KEYFUNC_START + 14) +#define SID_CURSORBLKDOWN (SID_KEYFUNC_START + 15) +#define SID_CURSORBLKLEFT (SID_KEYFUNC_START + 16) +#define SID_CURSORBLKRIGHT (SID_KEYFUNC_START + 17) +#define SID_CURSORBLKUP_SEL (SID_KEYFUNC_START + 18) +#define SID_CURSORBLKDOWN_SEL (SID_KEYFUNC_START + 19) +#define SID_CURSORBLKLEFT_SEL (SID_KEYFUNC_START + 20) +#define SID_CURSORBLKRIGHT_SEL (SID_KEYFUNC_START + 21) + +#define SID_NEXT_TABLE (SID_KEYFUNC_START + 22) +#define SID_PREV_TABLE (SID_KEYFUNC_START + 23) + +#define SID_NEXT_UNPROTECT (SID_KEYFUNC_START + 24) +#define SID_PREV_UNPROTECT (SID_KEYFUNC_START + 25) + +#define SID_SELECT_COL (SID_KEYFUNC_START + 26) +#define SID_SELECT_ROW (SID_KEYFUNC_START + 27) +#define SID_SELECT_NONE (SID_KEYFUNC_START + 28) +#define SID_ALIGNCURSOR (SID_KEYFUNC_START + 29) +#define SID_MARKDATAAREA (SID_KEYFUNC_START + 30) +#define SID_SETINPUTMODE (SID_KEYFUNC_START + 31) +#define SID_DELETE_CONTENTS (SID_KEYFUNC_START + 32) + +#define SID_MARKAREA (SID_KEYFUNC_START + 33) + +#define SID_AUTOFILL (SID_KEYFUNC_START + 34) +#define FID_FILL_AUTO (SID_KEYFUNC_START + 35) +#define SID_CANCEL (SID_KEYFUNC_START + 36) + +#define SID_CURSORENTERUP (SID_KEYFUNC_START + 37) +#define SID_CURSORENTERDOWN (SID_KEYFUNC_START + 38) #define SID_MARKARRAYFORMULA (SID_KEYFUNC_START + 39) #define SID_NEXT_TABLE_SEL (SID_KEYFUNC_START + 40) #define SID_PREV_TABLE_SEL (SID_KEYFUNC_START + 41) -#define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) +#define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) -#define SID_NEW_SLOTS (SID_KEYFUNC_END) -#define SID_NEW_SLOTS_END (SID_NEW_SLOTS+100) +#define SID_NEW_SLOTS (SID_KEYFUNC_END) +#define SID_NEW_SLOTS_END (SID_NEW_SLOTS+100) -#define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) -#define SID_COL_START (SID_NEW_SLOTS+2) -#define SID_ROW_START (SID_NEW_SLOTS+3) -#define SID_COL_END (SID_NEW_SLOTS+4) -#define SID_ROW_END (SID_NEW_SLOTS+5) -#define SID_KEEP_MARK (SID_NEW_SLOTS+6) -#define SID_FILL_DIR (SID_NEW_SLOTS+7) -#define SID_FILL_COUNT (SID_NEW_SLOTS+8) -#define SID_WITH_UNDO (SID_NEW_SLOTS+9) +#define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) +#define SID_COL_START (SID_NEW_SLOTS+2) +#define SID_ROW_START (SID_NEW_SLOTS+3) +#define SID_COL_END (SID_NEW_SLOTS+4) +#define SID_ROW_END (SID_NEW_SLOTS+5) +#define SID_KEEP_MARK (SID_NEW_SLOTS+6) +#define SID_FILL_DIR (SID_NEW_SLOTS+7) +#define SID_FILL_COUNT (SID_NEW_SLOTS+8) +#define SID_WITH_UNDO (SID_NEW_SLOTS+9) #define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10) -//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10) -#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) -#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) - -#define SID_SC_CELLS (SID_NEW_SLOTS+13) -#define SID_SC_RANGE (SID_NEW_SLOTS+14) -#define SID_SC_SELECTION (SID_NEW_SLOTS+15) -#define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) - -#define SID_SC_NAME_TITLE (SID_NEW_SLOTS+17) - -#define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) -#define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) -#define SID_RANGE_ROW (SID_NEW_SLOTS+20) -#define SID_RANGE_COL (SID_NEW_SLOTS+21) -#define SID_RANGE_TABLE (SID_NEW_SLOTS+22) -#define SID_RANGE_VALUE (SID_NEW_SLOTS+23) -#define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) -#define SID_RANGE_TEXT (SID_NEW_SLOTS+25) -#define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) -#define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) -#define SID_TABLES_GET (SID_NEW_SLOTS+28) -#define SID_PROP_INTERIOR (SID_NEW_SLOTS+29) -#define SID_PROP_FONT (SID_NEW_SLOTS+30) - -#define SID_DEFINE_PRINTAREA (SID_NEW_SLOTS+31) -#define SID_DELETE_PRINTAREA (SID_NEW_SLOTS+32) +//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10) +#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) +#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) + +#define SID_SC_CELLS (SID_NEW_SLOTS+13) +#define SID_SC_RANGE (SID_NEW_SLOTS+14) +#define SID_SC_SELECTION (SID_NEW_SLOTS+15) +#define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) + +#define SID_SC_NAME_TITLE (SID_NEW_SLOTS+17) + +#define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) +#define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) +#define SID_RANGE_ROW (SID_NEW_SLOTS+20) +#define SID_RANGE_COL (SID_NEW_SLOTS+21) +#define SID_RANGE_TABLE (SID_NEW_SLOTS+22) +#define SID_RANGE_VALUE (SID_NEW_SLOTS+23) +#define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) +#define SID_RANGE_TEXT (SID_NEW_SLOTS+25) +#define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) +#define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) +#define SID_TABLES_GET (SID_NEW_SLOTS+28) +#define SID_PROP_INTERIOR (SID_NEW_SLOTS+29) +#define SID_PROP_FONT (SID_NEW_SLOTS+30) + +#define SID_DEFINE_PRINTAREA (SID_NEW_SLOTS+31) +#define SID_DELETE_PRINTAREA (SID_NEW_SLOTS+32) #define SID_CHANGE_PRINTAREA (SID_NEW_SLOTS+33) -#define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34) +#define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34) -#define SID_OLE_OBJECT (SID_NEW_SLOTS+35) -#define SID_OLE_ACTIVATE (SID_NEW_SLOTS+36) -#define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37) +#define SID_OLE_OBJECT (SID_NEW_SLOTS+35) +#define SID_OLE_ACTIVATE (SID_NEW_SLOTS+36) +#define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37) -#define SID_TOGGLE_REL (SID_NEW_SLOTS+38) -#define SID_DATA_SELECT (SID_NEW_SLOTS+39) +#define SID_TOGGLE_REL (SID_NEW_SLOTS+38) +#define SID_DATA_SELECT (SID_NEW_SLOTS+39) -// Suchen & Ersetzen -#define FID_SEARCH (SID_NEW_SLOTS+40) -#define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41) -#define FID_REPLACE (SID_NEW_SLOTS+42) -#define FID_SEARCH_ALL (SID_NEW_SLOTS+43) -#define FID_REPLACE_ALL (SID_NEW_SLOTS+44) -#define FID_SEARCH_COUNT (SID_NEW_SLOTS+45) +// Suchen & Ersetzen +#define FID_SEARCH (SID_NEW_SLOTS+40) +#define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41) +#define FID_REPLACE (SID_NEW_SLOTS+42) +#define FID_SEARCH_ALL (SID_NEW_SLOTS+43) +#define FID_REPLACE_ALL (SID_NEW_SLOTS+44) +#define FID_SEARCH_COUNT (SID_NEW_SLOTS+45) -#define SID_SC_SETTEXT (SID_NEW_SLOTS+46) -#define SID_RANGE_ADDRESS (SID_NEW_SLOTS+47) -#define SID_RANGE_OFFSET (SID_NEW_SLOTS+48) -#define SID_NUMBER_FORMAT (SID_NEW_SLOTS+49) +#define SID_SC_SETTEXT (SID_NEW_SLOTS+46) +#define SID_RANGE_ADDRESS (SID_NEW_SLOTS+47) +#define SID_RANGE_OFFSET (SID_NEW_SLOTS+48) +#define SID_NUMBER_FORMAT (SID_NEW_SLOTS+49) -#define SID_OLE_SELECT (SID_NEW_SLOTS+50) -#define SID_SC_ACTIVEOBJECT (SID_NEW_SLOTS+51) +#define SID_OLE_SELECT (SID_NEW_SLOTS+50) +#define SID_SC_ACTIVEOBJECT (SID_NEW_SLOTS+51) -#define SID_RANGE_NOTETEXT (SID_NEW_SLOTS+52) -#define FID_INSERT_FILE (SID_NEW_SLOTS+53) +#define SID_RANGE_NOTETEXT (SID_NEW_SLOTS+52) +#define FID_INSERT_FILE (SID_NEW_SLOTS+53) -#define FID_VALIDATION (SID_NEW_SLOTS+54) +#define FID_VALIDATION (SID_NEW_SLOTS+54) -// Slots fuer Toolbox Controller in der Werkzeugleiste -#define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55) -#define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56) -#define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57) +// Slots fuer Toolbox Controller in der Werkzeugleiste +#define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55) +#define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56) +#define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57) #define SID_DEFINE_COLROWNAMERANGES (SID_NEW_SLOTS+58) -#define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59) - -// Items fuer Gueltigkeit -#define FID_VALID_MODE (SID_NEW_SLOTS+60) -#define FID_VALID_CONDMODE (SID_NEW_SLOTS+61) -#define FID_VALID_VALUE1 (SID_NEW_SLOTS+62) -#define FID_VALID_VALUE2 (SID_NEW_SLOTS+63) -#define FID_VALID_BLANK (SID_NEW_SLOTS+64) -#define FID_VALID_SHOWHELP (SID_NEW_SLOTS+65) -#define FID_VALID_HELPTITLE (SID_NEW_SLOTS+66) -#define FID_VALID_HELPTEXT (SID_NEW_SLOTS+67) -#define FID_VALID_SHOWERR (SID_NEW_SLOTS+68) -#define FID_VALID_ERRSTYLE (SID_NEW_SLOTS+69) -#define FID_VALID_ERRTITLE (SID_NEW_SLOTS+70) -#define FID_VALID_ERRTEXT (SID_NEW_SLOTS+71) - -#define SID_REFRESH_DBAREA (SID_NEW_SLOTS+72) -#define SID_RANGE_REGION (SID_NEW_SLOTS+73) - -#define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) - -// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu) -#define SID_ULINE_VAL_NONE (SID_NEW_SLOTS+75) -#define SID_ULINE_VAL_SINGLE (SID_NEW_SLOTS+76) -#define SID_ULINE_VAL_DOUBLE (SID_NEW_SLOTS+77) -#define SID_ULINE_VAL_DOTTED (SID_NEW_SLOTS+78) - -#define FID_DEL_MANUALBREAKS (SID_NEW_SLOTS+79) -#define SID_ADD_PRINTAREA (SID_NEW_SLOTS+80) -#define FID_ADJUST_PRINTZOOM (SID_NEW_SLOTS+81) -#define FID_RESET_PRINTZOOM (SID_NEW_SLOTS+82) - -#define SID_TABLES_COUNT (SID_NEW_SLOTS+83) -#define SID_ACTIVE_OBJ_NAME (SID_NEW_SLOTS+84) -#define SID_OBJECT_LEFT (SID_NEW_SLOTS+85) -#define SID_OBJECT_TOP (SID_NEW_SLOTS+86) -#define SID_OBJECT_WIDTH (SID_NEW_SLOTS+87) -#define SID_OBJECT_HEIGHT (SID_NEW_SLOTS+88) - -#define SID_PIVOT_CREATE (SID_NEW_SLOTS+89) -#define SID_PIVOT_FIELDS (SID_NEW_SLOTS+90) -#define SID_PFIELD_NAME (SID_NEW_SLOTS+91) -#define SID_PFIELD_ORIENTATION (SID_NEW_SLOTS+92) -#define SID_PFIELD_FUNCTION (SID_NEW_SLOTS+93) -#define SID_PIVOT_GET (SID_NEW_SLOTS+94) - -#define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) -#define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) +#define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59) + +// Items fuer Gueltigkeit +#define FID_VALID_MODE (SID_NEW_SLOTS+60) +#define FID_VALID_CONDMODE (SID_NEW_SLOTS+61) +#define FID_VALID_VALUE1 (SID_NEW_SLOTS+62) +#define FID_VALID_VALUE2 (SID_NEW_SLOTS+63) +#define FID_VALID_BLANK (SID_NEW_SLOTS+64) +#define FID_VALID_SHOWHELP (SID_NEW_SLOTS+65) +#define FID_VALID_HELPTITLE (SID_NEW_SLOTS+66) +#define FID_VALID_HELPTEXT (SID_NEW_SLOTS+67) +#define FID_VALID_SHOWERR (SID_NEW_SLOTS+68) +#define FID_VALID_ERRSTYLE (SID_NEW_SLOTS+69) +#define FID_VALID_ERRTITLE (SID_NEW_SLOTS+70) +#define FID_VALID_ERRTEXT (SID_NEW_SLOTS+71) + +#define SID_REFRESH_DBAREA (SID_NEW_SLOTS+72) +#define SID_RANGE_REGION (SID_NEW_SLOTS+73) + +#define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) + +// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu) +#define SID_ULINE_VAL_NONE (SID_NEW_SLOTS+75) +#define SID_ULINE_VAL_SINGLE (SID_NEW_SLOTS+76) +#define SID_ULINE_VAL_DOUBLE (SID_NEW_SLOTS+77) +#define SID_ULINE_VAL_DOTTED (SID_NEW_SLOTS+78) + +#define FID_DEL_MANUALBREAKS (SID_NEW_SLOTS+79) +#define SID_ADD_PRINTAREA (SID_NEW_SLOTS+80) +#define FID_ADJUST_PRINTZOOM (SID_NEW_SLOTS+81) +#define FID_RESET_PRINTZOOM (SID_NEW_SLOTS+82) + +#define SID_TABLES_COUNT (SID_NEW_SLOTS+83) +#define SID_ACTIVE_OBJ_NAME (SID_NEW_SLOTS+84) +#define SID_OBJECT_LEFT (SID_NEW_SLOTS+85) +#define SID_OBJECT_TOP (SID_NEW_SLOTS+86) +#define SID_OBJECT_WIDTH (SID_NEW_SLOTS+87) +#define SID_OBJECT_HEIGHT (SID_NEW_SLOTS+88) + +#define SID_PIVOT_CREATE (SID_NEW_SLOTS+89) +#define SID_PIVOT_FIELDS (SID_NEW_SLOTS+90) +#define SID_PFIELD_NAME (SID_NEW_SLOTS+91) +#define SID_PFIELD_ORIENTATION (SID_NEW_SLOTS+92) +#define SID_PFIELD_FUNCTION (SID_NEW_SLOTS+93) +#define SID_PIVOT_GET (SID_NEW_SLOTS+94) + +#define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) +#define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) // idl Parameter --------------------------------------------------------- -//aus sfx: #define FN_PARAM_1 (SC_PARAM_START) -//aus sfx: #define FN_PARAM_2 (SC_PARAM_START+1) -//aus sfx: #define FN_PARAM_3 (SC_PARAM_START+2) -//aus sfx: #define FN_PARAM_4 (SC_PARAM_START+3) -//aus sfx: #define FN_PARAM_5 (SC_PARAM_START+4) -//aus sfx: #define FN_PARAM_6 (SC_PARAM_START+5) -//aus sfx: #define FN_PARAM_7 (SC_PARAM_START+6) -//aus sfx: #define FN_PARAM_8 (SC_PARAM_START+7) -#define FN_PARAM_9 (FN_PARAM_8+1) - -#define SID_SORT_BYROW (SC_PARAM_START) -#define SID_SORT_HASHEADER (SC_PARAM_START+1) -#define SID_SORT_CASESENS (SC_PARAM_START+2) -#define SID_SORT_ATTRIBS (SC_PARAM_START+3) -#define SID_SORT_USERDEF (SC_PARAM_START+4) +//aus sfx: #define FN_PARAM_1 (SC_PARAM_START) +//aus sfx: #define FN_PARAM_2 (SC_PARAM_START+1) +//aus sfx: #define FN_PARAM_3 (SC_PARAM_START+2) +//aus sfx: #define FN_PARAM_4 (SC_PARAM_START+3) +//aus sfx: #define FN_PARAM_5 (SC_PARAM_START+4) +//aus sfx: #define FN_PARAM_6 (SC_PARAM_START+5) +//aus sfx: #define FN_PARAM_7 (SC_PARAM_START+6) +//aus sfx: #define FN_PARAM_8 (SC_PARAM_START+7) +#define FN_PARAM_9 (FN_PARAM_8+1) + +#define SID_SORT_BYROW (SC_PARAM_START) +#define SID_SORT_HASHEADER (SC_PARAM_START+1) +#define SID_SORT_CASESENS (SC_PARAM_START+2) +#define SID_SORT_ATTRIBS (SC_PARAM_START+3) +#define SID_SORT_USERDEF (SC_PARAM_START+4) // Resourcen ------------------------------------------------------------- -#define RID_OBJECTBAR_APP (SC_RESOURCE_START) -#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) -#define RID_OBJECTBAR_INPUT (SC_RESOURCE_START+2) -#define RID_POPUP_CELLS (SC_RESOURCE_START+3) -#define RID_POPUP_DRAW (SC_RESOURCE_START+4) -#define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) -#define RID_OBJECTBAR_PREVIEW (SC_RESOURCE_START+6) -#define RID_POPUP_PREVIEW (SC_RESOURCE_START+7) -#define RID_POPUP_OLE (SC_RESOURCE_START+8) -#define RID_POPUP_CHART (SC_RESOURCE_START+9) -//#define RID_ANCHORBITMAP (SC_RESOURCE_START+10) -//#define RID_GRAYANCHORBITMAP (SC_RESOURCE_START+11) -#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12) -#define RID_DRAW_WIN (SC_RESOURCE_START+13) -#define RID_CNTRLR_WIN (SC_RESOURCE_START+14) +#define RID_OBJECTBAR_APP (SC_RESOURCE_START) +#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) +#define RID_OBJECTBAR_INPUT (SC_RESOURCE_START+2) +#define RID_POPUP_CELLS (SC_RESOURCE_START+3) +#define RID_POPUP_DRAW (SC_RESOURCE_START+4) +#define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) +#define RID_OBJECTBAR_PREVIEW (SC_RESOURCE_START+6) +#define RID_POPUP_PREVIEW (SC_RESOURCE_START+7) +#define RID_POPUP_OLE (SC_RESOURCE_START+8) +#define RID_POPUP_CHART (SC_RESOURCE_START+9) +//#define RID_ANCHORBITMAP (SC_RESOURCE_START+10) +//#define RID_GRAYANCHORBITMAP (SC_RESOURCE_START+11) +#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12) +#define RID_DRAW_WIN (SC_RESOURCE_START+13) +#define RID_CNTRLR_WIN (SC_RESOURCE_START+14) #define RID_GLOBSTR (SC_RESOURCE_START+15) -#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) -#define RID_SCFUNCTIONS (SC_RESOURCE_START+20) -#define RID_POPUP_PIVOT (SC_RESOURCE_START+21) +#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) +#define RID_SCFUNCTIONS (SC_RESOURCE_START+20) +#define RID_POPUP_PIVOT (SC_RESOURCE_START+21) #define RID_IMGLIST_INPUTWIN (SC_RESOURCE_START+22) -#define RID_ERRHDLSC (SC_RESOURCE_START+23) -#define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24) -#define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29) -#define RID_MN_FORMAT_ALGN (SC_RESOURCE_START+30) -#define RID_MN_FORMAT_STYLE (SC_RESOURCE_START+31) -#define RID_MN_FORMAT_LINESPACE (SC_RESOURCE_START+32) -#define RID_POPUP_EDIT (SC_RESOURCE_START+33) -#define RID_POPUP_AUDIT (SC_RESOURCE_START+34) -#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) +#define RID_ERRHDLSC (SC_RESOURCE_START+23) +#define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24) +#define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29) +#define RID_MN_FORMAT_ALGN (SC_RESOURCE_START+30) +#define RID_MN_FORMAT_STYLE (SC_RESOURCE_START+31) +#define RID_MN_FORMAT_LINESPACE (SC_RESOURCE_START+32) +#define RID_POPUP_EDIT (SC_RESOURCE_START+33) +#define RID_POPUP_AUDIT (SC_RESOURCE_START+34) +#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) // free // free -#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38) -#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39) -#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) +#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38) +#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39) +#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) // free // free -#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) -#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) -#define RID_POPUP_CONTROL (SC_RESOURCE_START+45) -#define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) +#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) +#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) +#define RID_POPUP_CONTROL (SC_RESOURCE_START+45) +#define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) // free -#define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48) -#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50) -#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51) -#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52) -#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53) -#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) +#define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48) +#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50) +#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51) +#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52) +#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53) +#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) // free // free -#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) +#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) -#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60) -#define RID_POPUP_MEDIA (SC_RESOURCE_START+61) -#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) +#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60) +#define RID_POPUP_MEDIA (SC_RESOURCE_START+61) +#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) #define STR_START (SC_RESOURCE_START+100) -#define STR_ROWHEIGHT (STR_START) -#define STR_ROWHEIGHT_TITLE (STR_START + 1) -#define STR_OPT_ROWHEIGHT (STR_START + 2) -#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3) -#define STR_COLWIDTH (STR_START + 4) -#define STR_COLWIDTH_TITLE (STR_START + 5) -#define STR_OPT_COLWIDTH (STR_START + 6) -#define STR_OPT_COLWIDTH_TITLE (STR_START + 7) -#define SCSTR_UNDEFINED (STR_START + 8) -#define SCSTR_NONAME (STR_START + 9) -#define SCSTR_NONE (STR_START + 10) -#define SCSTR_EMPTY (STR_START + 11) -#define SCSTR_NOTEMPTY (STR_START + 12) +#define STR_ROWHEIGHT (STR_START) +#define STR_ROWHEIGHT_TITLE (STR_START + 1) +#define STR_OPT_ROWHEIGHT (STR_START + 2) +#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3) +#define STR_COLWIDTH (STR_START + 4) +#define STR_COLWIDTH_TITLE (STR_START + 5) +#define STR_OPT_COLWIDTH (STR_START + 6) +#define STR_OPT_COLWIDTH_TITLE (STR_START + 7) +#define SCSTR_UNDEFINED (STR_START + 8) +#define SCSTR_NONAME (STR_START + 9) +#define SCSTR_NONE (STR_START + 10) +#define SCSTR_EMPTY (STR_START + 11) +#define SCSTR_NOTEMPTY (STR_START + 12) #define SCSTR_COLUMN (STR_START + 13) #define SCSTR_ROW (STR_START + 14) #define SCSTR_NEW (STR_START + 15) @@ -1203,76 +1203,76 @@ #define SCSTR_REMOVE (STR_START + 17) #define SCSTR_CANCEL (STR_START + 18) #define SCSTR_MODIFY (STR_START + 19) -#define SCSTR_SHOWTABLE (STR_START + 20) -#define SCSTR_HIDDENTABLES (STR_START + 21) -#define SCSTR_SELECTDB (STR_START + 22) -#define SCSTR_AREAS (STR_START + 23) -#define SCSTR_TABLE (STR_START + 24) -#define SCSTR_NAME (STR_START + 25) -#define SCSTR_INSTABLE (STR_START + 26) -#define SCSTR_APDTABLE (STR_START + 27) -#define SCSTR_RENAMETAB (STR_START + 28) -#define STR_INSERTGRAPHIC (STR_START + 29) +#define SCSTR_SHOWTABLE (STR_START + 20) +#define SCSTR_HIDDENTABLES (STR_START + 21) +#define SCSTR_SELECTDB (STR_START + 22) +#define SCSTR_AREAS (STR_START + 23) +#define SCSTR_TABLE (STR_START + 24) +#define SCSTR_NAME (STR_START + 25) +#define SCSTR_INSTABLE (STR_START + 26) +#define SCSTR_APDTABLE (STR_START + 27) +#define SCSTR_RENAMETAB (STR_START + 28) +#define STR_INSERTGRAPHIC (STR_START + 29) //#define STR_BASIC_IDE (STR_START + 30) -#define SCSTR_APPLICATION (STR_START + 31) -#define SCSTR_DOCSHELL (STR_START + 32) -#define SCSTR_TABVIEWSHELL (STR_START + 33) -#define SCSTR_EDITSHELL (STR_START + 34) -#define SCSTR_DRAWSHELL (STR_START + 35) -#define SCSTR_DRAWTEXTSHELL (STR_START + 36) +#define SCSTR_APPLICATION (STR_START + 31) +#define SCSTR_DOCSHELL (STR_START + 32) +#define SCSTR_TABVIEWSHELL (STR_START + 33) +#define SCSTR_EDITSHELL (STR_START + 34) +#define SCSTR_DRAWSHELL (STR_START + 35) +#define SCSTR_DRAWTEXTSHELL (STR_START + 36) #define SCSTR_NEWTABLE (STR_START + 37) -#define SCSTR_PREVIEWSHELL (STR_START + 38) +#define SCSTR_PREVIEWSHELL (STR_START + 38) -#define SCSTR_PROTECTDOC (STR_START + 39) -#define SCSTR_UNPROTECTDOC (STR_START + 40) -#define SCSTR_PROTECTTAB (STR_START + 41) -#define SCSTR_UNPROTECTTAB (STR_START + 42) -#define SCSTR_PASSWORD (STR_START + 43) -#define SCSTR_PASSWORDOPT (STR_START + 44) -#define SCSTR_WRONGPASSWORD (STR_START + 45) +#define SCSTR_PROTECTDOC (STR_START + 39) +#define SCSTR_UNPROTECTDOC (STR_START + 40) +#define SCSTR_PROTECTTAB (STR_START + 41) +#define SCSTR_UNPROTECTTAB (STR_START + 42) +#define SCSTR_PASSWORD (STR_START + 43) +#define SCSTR_PASSWORDOPT (STR_START + 44) +#define SCSTR_WRONGPASSWORD (STR_START + 45) -#define SCSTR_PIVOTSHELL (STR_START + 46) -#define SCSTR_END (STR_START + 47) -#define SCSTR_STAT_PRINT (STR_START + 48) +#define SCSTR_PIVOTSHELL (STR_START + 46) +#define SCSTR_END (STR_START + 47) +#define SCSTR_STAT_PRINT (STR_START + 48) #define SCSTR_UNKNOWN (STR_START + 49) #define SCSTR_CHAR_ATTRS (STR_START + 50) -#define SCSTR_ALL (STR_START + 51) -#define SCSTR_STDFILTER (STR_START + 52) +#define SCSTR_ALL (STR_START + 51) +#define SCSTR_STDFILTER (STR_START + 52) // Cfg-Item-Namen #define SCSTR_CFG_APP (STR_START + 53) #define SCSTR_CFG_DOC (STR_START + 54) #define SCSTR_CFG_VIEW (STR_START + 55) #define SCSTR_CFG_SPELLCHECK (STR_START + 56) -#define SCSTR_CFG_PRINT (STR_START + 57) +#define SCSTR_CFG_PRINT (STR_START + 57) -#define SCSTR_AUDITSHELL (STR_START + 58) +#define SCSTR_AUDITSHELL (STR_START + 58) -#define SCSTR_CHARSET_USER (STR_START + 59) -#define SCSTR_COLUMN_USER (STR_START + 60) -#define SCSTR_FIELDSEP (STR_START + 61) -#define SCSTR_TEXTSEP (STR_START + 62) +#define SCSTR_CHARSET_USER (STR_START + 59) +#define SCSTR_COLUMN_USER (STR_START + 60) +#define SCSTR_FIELDSEP (STR_START + 61) +#define SCSTR_TEXTSEP (STR_START + 62) -#define SCSTR_30_APPLICATION (STR_START + 63) -#define SCSTR_30_LONG_DOCNAME (STR_START + 64) +#define SCSTR_30_APPLICATION (STR_START + 63) +#define SCSTR_30_LONG_DOCNAME (STR_START + 64) -#define SCSTR_CFG_INPUT (STR_START + 65) +#define SCSTR_CFG_INPUT (STR_START + 65) -#define SCSTR_TOP10FILTER (STR_START + 66) +#define SCSTR_TOP10FILTER (STR_START + 66) #define SCSTR_CFG_NAVIPI (STR_START + 67) -#define SCSTR_40_APPLICATION (STR_START + 68) -#define SCSTR_40_LONG_DOCNAME (STR_START + 69) +#define SCSTR_40_APPLICATION (STR_START + 68) +#define SCSTR_40_LONG_DOCNAME (STR_START + 69) -#define SCSTR_DRAWFORMSHELL (STR_START + 70) -#define SCSTR_CELLSHELL (STR_START + 71) -#define SCSTR_FORMATSHELL (STR_START + 72) -#define SCSTR_OLEOBJECTSHELL (STR_START + 73) -#define SCSTR_CHARTSHELL (STR_START + 74) -#define SCSTR_GRAPHICSHELL (STR_START + 75) -#define SCSTR_PAGEBREAKSHELL (STR_START + 76) +#define SCSTR_DRAWFORMSHELL (STR_START + 70) +#define SCSTR_CELLSHELL (STR_START + 71) +#define SCSTR_FORMATSHELL (STR_START + 72) +#define SCSTR_OLEOBJECTSHELL (STR_START + 73) +#define SCSTR_CHARTSHELL (STR_START + 74) +#define SCSTR_GRAPHICSHELL (STR_START + 75) +#define SCSTR_PAGEBREAKSHELL (STR_START + 76) #define SCSTR_GRFILTER_OPENERROR (STR_START + 77) #define SCSTR_GRFILTER_IOERROR (STR_START + 78) @@ -1282,13 +1282,13 @@ #define SCSTR_GRFILTER_TOOBIG (STR_START + 82) #define SCSTR_UNDO_GRAFFILTER (STR_START + 83) -#define SCSTR_50_APPLICATION (STR_START + 84) -#define SCSTR_50_LONG_DOCNAME (STR_START + 85) +#define SCSTR_50_APPLICATION (STR_START + 84) +#define SCSTR_50_LONG_DOCNAME (STR_START + 85) #define SCSTR_CHG_PROTECT (STR_START + 86) #define SCSTR_CHG_UNPROTECT (STR_START + 87) // #98185# -#define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) +#define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) // dialog: Select Sheets #define STR_DLG_SELECTTABLES_TITLE (STR_START + 89) @@ -1305,19 +1305,19 @@ // Items -#define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100) -#define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101) -#define SCSTR_HOR_JUSTIFY_RIGHT (STR_START + 102) -#define SCSTR_HOR_JUSTIFY_BLOCK (STR_START + 103) -#define SCSTR_HOR_JUSTIFY_REPEAT (STR_START + 104) -#define SCSTR_HOR_JUSTIFY_STANDARD (STR_START + 105) -#define SCSTR_VER_JUSTIFY_TOP (STR_START + 106) -#define SCSTR_VER_JUSTIFY_CENTER (STR_START + 107) -#define SCSTR_VER_JUSTIFY_BOTTOM (STR_START + 108) -#define SCSTR_VER_JUSTIFY_STANDARD (STR_START + 109) -#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110) -#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) -#define SCSTR_ORIENTATION_STANDARD (STR_START + 112) +#define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100) +#define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101) +#define SCSTR_HOR_JUSTIFY_RIGHT (STR_START + 102) +#define SCSTR_HOR_JUSTIFY_BLOCK (STR_START + 103) +#define SCSTR_HOR_JUSTIFY_REPEAT (STR_START + 104) +#define SCSTR_HOR_JUSTIFY_STANDARD (STR_START + 105) +#define SCSTR_VER_JUSTIFY_TOP (STR_START + 106) +#define SCSTR_VER_JUSTIFY_CENTER (STR_START + 107) +#define SCSTR_VER_JUSTIFY_BOTTOM (STR_START + 108) +#define SCSTR_VER_JUSTIFY_STANDARD (STR_START + 109) +#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110) +#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) +#define SCSTR_ORIENTATION_STANDARD (STR_START + 112) // Accessibility ------------------------------------ @@ -1370,34 +1370,34 @@ #define SCSTR_SHORT_SCDOC_NAME (STR_START + 211) #define SCSTR_LONG_SCDOC_NAME (STR_START + 212) -#define SCSTR_CLPBRD_CLEAR (STR_START + 213) +#define SCSTR_CLPBRD_CLEAR (STR_START + 213) -#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) +#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) -#define SCSTR_RENAMEOBJECT (STR_START + 215) +#define SCSTR_RENAMEOBJECT (STR_START + 215) #define SCSTR_PRINT_OPTIONS (STR_START+216) // Navigator - in der Reihenfolge wie SC_CONTENT_... -#define SCSTR_CONTENT_ROOT (STR_START + 250) -#define SCSTR_CONTENT_TABLE (STR_START + 251) -#define SCSTR_CONTENT_RANGENAME (STR_START + 252) -#define SCSTR_CONTENT_DBAREA (STR_START + 253) -#define SCSTR_CONTENT_GRAPHIC (STR_START + 254) -#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255) -#define SCSTR_CONTENT_NOTE (STR_START + 256) -#define SCSTR_CONTENT_AREALINK (STR_START + 257) -#define SCSTR_CONTENT_DRAWING (STR_START + 258) -// hier ein wenig Platz fuer Erweiterungen +#define SCSTR_CONTENT_ROOT (STR_START + 250) +#define SCSTR_CONTENT_TABLE (STR_START + 251) +#define SCSTR_CONTENT_RANGENAME (STR_START + 252) +#define SCSTR_CONTENT_DBAREA (STR_START + 253) +#define SCSTR_CONTENT_GRAPHIC (STR_START + 254) +#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255) +#define SCSTR_CONTENT_NOTE (STR_START + 256) +#define SCSTR_CONTENT_AREALINK (STR_START + 257) +#define SCSTR_CONTENT_DRAWING (STR_START + 258) +// hier ein wenig Platz fuer Erweiterungen // Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe) -#define SCSTR_QHELP_INPUTWND (STR_START + 307) -#define SCSTR_QHELP_POSWND (STR_START + 308) -#define SCSTR_QHELP_BTNCALC (STR_START + 309) -#define SCSTR_QHELP_BTNOK (STR_START + 310) -#define SCSTR_QHELP_BTNCANCEL (STR_START + 311) -#define SCSTR_QHELP_BTNSUM (STR_START + 312) -#define SCSTR_QHELP_BTNEQUAL (STR_START + 313) +#define SCSTR_QHELP_INPUTWND (STR_START + 307) +#define SCSTR_QHELP_POSWND (STR_START + 308) +#define SCSTR_QHELP_BTNCALC (STR_START + 309) +#define SCSTR_QHELP_BTNOK (STR_START + 310) +#define SCSTR_QHELP_BTNCANCEL (STR_START + 311) +#define SCSTR_QHELP_BTNSUM (STR_START + 312) +#define SCSTR_QHELP_BTNEQUAL (STR_START + 313) // Validator #define SCSTR_VALID_MINIMUM (STR_START + 314) @@ -1407,22 +1407,22 @@ #define SCSTR_VALID_LIST (STR_START + 318) // Formulator -#define SCSTR_FUDB (STR_START + 389) -#define SCSTR_FUDATE (STR_START + 390) -#define SCSTR_FUFIN (STR_START + 391) -#define SCSTR_FUINFO (STR_START + 392) -#define SCSTR_FULOG (STR_START + 393) -#define SCSTR_FUMATHS (STR_START + 394) -#define SCSTR_FUSTAT (STR_START + 395) -#define SCSTR_FUTAB (STR_START + 396) -#define SCSTR_FUTEXT (STR_START + 397) +#define SCSTR_FUDB (STR_START + 389) +#define SCSTR_FUDATE (STR_START + 390) +#define SCSTR_FUFIN (STR_START + 391) +#define SCSTR_FUINFO (STR_START + 392) +#define SCSTR_FULOG (STR_START + 393) +#define SCSTR_FUMATHS (STR_START + 394) +#define SCSTR_FUSTAT (STR_START + 395) +#define SCSTR_FUTAB (STR_START + 396) +#define SCSTR_FUTEXT (STR_START + 397) // #define SCSTR_COMPILER_STRINGS (STR_START + 398) #define SCSTR_FILTER_STRINGS (STR_START + 399) #define SCSTR_COMPILER_INTL_STR (STR_START + 400) // Media shell -#define SCSTR_MEDIASHELL (STR_START + 401) +#define SCSTR_MEDIASHELL (STR_START + 401) #define RID_SCSTR_ONCLICK (STR_START + 402) @@ -1431,25 +1431,25 @@ #define STR_END (SCSTR_NO_TAB_BG_COLOR) -#define BMP_START (STR_END) +#define BMP_START (STR_END) // Navigator // not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE //#define RID_BMP_EXPAND (BMP_START) //#define RID_BMP_COLLAPSE (BMP_START + 1) -#define RID_IMG_DROP_URL (BMP_START + 2) -#define RID_IMG_DROP_LINK (BMP_START + 3) -#define RID_IMG_DROP_COPY (BMP_START + 4) -#define RID_IMG_H_DROP_URL (BMP_START + 5) -#define RID_IMG_H_DROP_LINK (BMP_START + 6) -#define RID_IMG_H_DROP_COPY (BMP_START + 7) +#define RID_IMG_DROP_URL (BMP_START + 2) +#define RID_IMG_DROP_LINK (BMP_START + 3) +#define RID_IMG_DROP_COPY (BMP_START + 4) +#define RID_IMG_H_DROP_URL (BMP_START + 5) +#define RID_IMG_H_DROP_LINK (BMP_START + 6) +#define RID_IMG_H_DROP_COPY (BMP_START + 7) #define RID_IMG_SELECT_CURRENT (BMP_START + 8) #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9) #define RID_SCPTR_PIVOTCOL (BMP_START + 81) #define RID_SCPTR_PIVOTROW (BMP_START + 82) #define RID_SCPTR_DETECTIVE (BMP_START + 83) -#define RID_SCPTR_CHART (BMP_START + 84) +#define RID_SCPTR_CHART (BMP_START + 84) #define RID_SCICN_DOCUMENT (BMP_START + 95) #define RID_SCICN_TEMPLATE (BMP_START + 96) @@ -1457,26 +1457,26 @@ #define BMP_END (BMP_START + 100) -#define SC_DIALOGS_START (BMP_END) -#define RID_SCDLG_ATTR (SC_DIALOGS_START) -#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1) -#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2) -#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3) -#define RID_SCDLG_SORT (SC_DIALOGS_START + 5) -#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6) -#define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7) -#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8) -#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) -#define RID_SCMISCDLGS (SC_DIALOGS_START + 10) -#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) -#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) -#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) -#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14) -#define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15) -#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16) -#define RID_SCDLG_MTRINPUT (SC_DIALOGS_START + 17) -#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) -#define RID_SCDLG_FILLSERIES (SC_DIALOGS_START + 19) +#define SC_DIALOGS_START (BMP_END) +#define RID_SCDLG_ATTR (SC_DIALOGS_START) +#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1) +#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2) +#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3) +#define RID_SCDLG_SORT (SC_DIALOGS_START + 5) +#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6) +#define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7) +#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8) +#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) +#define RID_SCMISCDLGS (SC_DIALOGS_START + 10) +#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) +#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) +#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) +#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14) +#define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15) +#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16) +#define RID_SCDLG_MTRINPUT (SC_DIALOGS_START + 17) +#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) +#define RID_SCDLG_FILLSERIES (SC_DIALOGS_START + 19) #define RID_SCDLG_AUTOFORMAT (SC_DIALOGS_START + 20) #define RID_SCDLG_GROUP (SC_DIALOGS_START + 21) #define RID_SCDLG_NAMES (SC_DIALOGS_START + 22) @@ -1484,137 +1484,137 @@ #define RID_SCDLG_PRINTOPTIONS (SC_DIALOGS_START + 24) #define RID_SCPAGE_PRINTOPTIONS (SC_DIALOGS_START + 25) #define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26) -#define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27) -#define RID_SUBTBASE (SC_DIALOGS_START + 28) -#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) +#define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27) +#define RID_SUBTBASE (SC_DIALOGS_START + 28) +#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) #define RID_SCDLG_OPTIONS (SC_DIALOGS_START + 30) #define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31) #define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33) #define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34) #define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35) #define RID_SCTBXWND_SCENARIO (SC_DIALOGS_START + 36) -#define RID_SCDLG_FORMULATOR (SC_DIALOGS_START + 37) +#define RID_SCDLG_FORMULATOR (SC_DIALOGS_START + 37) #define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38) #define RID_SCDLG_NEWSCENARIO (SC_DIALOGS_START + 39) -#define RID_SCDLG_FORMULA (SC_DIALOGS_START + 40) +#define RID_SCDLG_FORMULA (SC_DIALOGS_START + 40) #define RID_SCDLG_ARGUMENTS (SC_DIALOGS_START + 41) #define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42) #define RID_SCPAGE_TABLE (SC_DIALOGS_START + 43) #define RID_SCPAGE_AREAS (SC_DIALOGS_START + 44) -#define RID_SCDLG_STYLES_START (SC_DIALOGS_START + 45) -#define RID_SCDLG_STYLES_CHAR (SC_DIALOGS_START + 45) -#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) -#define RID_SCDLG_STYLES_FRAME (SC_DIALOGS_START + 47) -#define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) -#define RID_SCDLG_STYLES_END (SC_DIALOGS_START + 48) -#define RID_HFBASE (SC_DIALOGS_START + 49) -#define RID_SCDLG_HFEDIT (SC_DIALOGS_START + 50) +#define RID_SCDLG_STYLES_START (SC_DIALOGS_START + 45) +#define RID_SCDLG_STYLES_CHAR (SC_DIALOGS_START + 45) +#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) +#define RID_SCDLG_STYLES_FRAME (SC_DIALOGS_START + 47) +#define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) +#define RID_SCDLG_STYLES_END (SC_DIALOGS_START + 48) +#define RID_HFBASE (SC_DIALOGS_START + 49) +#define RID_SCDLG_HFEDIT (SC_DIALOGS_START + 50) #define RID_SCDLG_HFEDIT_ALL (SC_DIALOGS_START + 51) #define RID_SCDLG_HFED_HEADER (SC_DIALOGS_START + 52) -#define RID_SCDLG_HFED_FOOTER (SC_DIALOGS_START + 53) +#define RID_SCDLG_HFED_FOOTER (SC_DIALOGS_START + 53) #define RID_SCBTN_HFEDIT (SC_DIALOGS_START + 54) -#define RID_SCPAGE_VIEW (SC_DIALOGS_START + 55) -#define RID_SCPAGE_CALC (SC_DIALOGS_START + 56) -#define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57) -#define RID_SCDLG_TABOP (SC_DIALOGS_START + 58) -#define RID_SCDLG_IMPORTOPT (SC_DIALOGS_START + 59) +#define RID_SCPAGE_VIEW (SC_DIALOGS_START + 55) +#define RID_SCPAGE_CALC (SC_DIALOGS_START + 56) +#define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57) +#define RID_SCDLG_TABOP (SC_DIALOGS_START + 58) +#define RID_SCDLG_IMPORTOPT (SC_DIALOGS_START + 59) #define RID_POPUP_ROWHEADER (SC_DIALOGS_START + 60) #define RID_POPUP_COLHEADER (SC_DIALOGS_START + 61) #define RID_SCDLG_HFEDIT_SHDR (SC_DIALOGS_START + 62) #define RID_SCDLG_HFEDIT_SFTR (SC_DIALOGS_START + 63) -#define RID_SCDLG_HFEDIT_LEFTHEADER (SC_DIALOGS_START + 64) +#define RID_SCDLG_HFEDIT_LEFTHEADER (SC_DIALOGS_START + 64) #define RID_SCDLG_HFEDIT_RIGHTHEADER (SC_DIALOGS_START + 65) -#define RID_SCDLG_HFEDIT_LEFTFOOTER (SC_DIALOGS_START + 66) -#define RID_SCDLG_HFEDIT_RIGHTFOOTER (SC_DIALOGS_START + 67) -#define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68) -#define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69) -#define RID_SCPAGE_PRINT (SC_DIALOGS_START + 70) +#define RID_SCDLG_HFEDIT_LEFTFOOTER (SC_DIALOGS_START + 66) +#define RID_SCDLG_HFEDIT_RIGHTFOOTER (SC_DIALOGS_START + 67) +#define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68) +#define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69) +#define RID_SCPAGE_PRINT (SC_DIALOGS_START + 70) #define RID_SCDLG_COLORROW (SC_DIALOGS_START + 71) #define RID_SCDLG_NAMES_PASTE (SC_DIALOGS_START + 72) #define RID_SCDLG_NAMES_CREATE (SC_DIALOGS_START + 73) #define RID_SCDLG_NAMES_APPLY (SC_DIALOGS_START + 74) //NYI -#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76) -#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77) -//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78) +#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76) +#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77) +//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78) -#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79) -#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80) -#define RID_SCDLG_AREAS (SC_DIALOGS_START + 81) +#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79) +#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80) +#define RID_SCDLG_AREAS (SC_DIALOGS_START + 81) -#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) +#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) - // Popup fuer Statusbar-Controller -#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83) -#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84) -#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85) -#define RID_SUMCTL_MAX (SC_DIALOGS_START + 86) -#define RID_SUMCTL_COUNT (SC_DIALOGS_START + 87) -#define RID_SUMCTL_COUNT2 (SC_DIALOGS_START + 88) -#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89) -#define RID_SUMCTL_NONE (SC_DIALOGS_START + 90) + // Popup fuer Statusbar-Controller +#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83) +#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84) +#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85) +#define RID_SUMCTL_MAX (SC_DIALOGS_START + 86) +#define RID_SUMCTL_COUNT (SC_DIALOGS_START + 87) +#define RID_SUMCTL_COUNT2 (SC_DIALOGS_START + 88) +#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89) +#define RID_SUMCTL_NONE (SC_DIALOGS_START + 90) -#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) +#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) - // Popup fuer Drop-Modus im Navigator -#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92) -#define RID_DROPMODE_URL (SC_DIALOGS_START + 93) -#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) -#define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) -#define RID_SCDLG_CONDFORMAT (SC_DIALOGS_START + 96) + // Popup fuer Drop-Modus im Navigator +#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92) +#define RID_DROPMODE_URL (SC_DIALOGS_START + 93) +#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) +#define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) +#define RID_SCDLG_CONDFORMAT (SC_DIALOGS_START + 96) -#define RID_SCPAGE_SUBT_GROUP1 (SC_DIALOGS_START + 97) -#define RID_SCPAGE_SUBT_GROUP2 (SC_DIALOGS_START + 98) -#define RID_SCPAGE_SUBT_GROUP3 (SC_DIALOGS_START + 99) +#define RID_SCPAGE_SUBT_GROUP1 (SC_DIALOGS_START + 97) +#define RID_SCPAGE_SUBT_GROUP2 (SC_DIALOGS_START + 98) +#define RID_SCPAGE_SUBT_GROUP3 (SC_DIALOGS_START + 99) -#define RID_SCPAGE_HFED_HL (SC_DIALOGS_START + 100) -#define RID_SCPAGE_HFED_HR (SC_DIALOGS_START + 101) -#define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102) -#define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103) +#define RID_SCPAGE_HFED_HL (SC_DIALOGS_START + 100) +#define RID_SCPAGE_HFED_HR (SC_DIALOGS_START + 101) +#define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102) +#define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103) // Ableitungen von RID_SCDLG_MTRINPUT -#define RID_SCDLG_COL_MAN (SC_DIALOGS_START + 104) -#define RID_SCDLG_COL_OPT (SC_DIALOGS_START + 105) -#define RID_SCDLG_ROW_MAN (SC_DIALOGS_START + 106) -#define RID_SCDLG_ROW_OPT (SC_DIALOGS_START + 107) +#define RID_SCDLG_COL_MAN (SC_DIALOGS_START + 104) +#define RID_SCDLG_COL_OPT (SC_DIALOGS_START + 105) +#define RID_SCDLG_ROW_MAN (SC_DIALOGS_START + 106) +#define RID_SCDLG_ROW_OPT (SC_DIALOGS_START + 107) // Ableitungen von RID_SCDLG_SELENTRY -#define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) -#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) +#define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) +#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) // Ableitungen von RID_SCDLG_GROUP -#define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110) -#define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111) +#define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110) +#define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111) -#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112) +#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112) -#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) +#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) #define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114) -#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115) +#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115) -#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116) -#define RID_SCTAB_FUNCTION (SC_DIALOGS_START + 117) -#define RID_SCTAB_STRUCT (SC_DIALOGS_START + 118) +#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116) +#define RID_SCTAB_FUNCTION (SC_DIALOGS_START + 117) +#define RID_SCTAB_STRUCT (SC_DIALOGS_START + 118) -#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119) +#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119) -#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120) -#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) -#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) +#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120) +#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) +#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) -#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123) -#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124) +#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123) +#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124) -#define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) -#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) -#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) -#define RID_SCPAGE_OPTLOAD (SC_DIALOGS_START + 128) +#define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) +#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) +#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) +#define RID_SCPAGE_OPTLOAD (SC_DIALOGS_START + 128) -#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129) -#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) -#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) +#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129) +#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) +#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) -#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) +#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) #define RID_SCDLG_DPDATAFIELD (SC_DIALOGS_START + 133) #define RID_SCDLG_DPSUBTOTAL_OPT (SC_DIALOGS_START + 134) #define RID_SCDLG_DPNUMGROUP (SC_DIALOGS_START + 135) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 442e62bdd9cb..05ca719b005c 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -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 @@ -87,24 +87,24 @@ public: class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg { public: - virtual void GetValues( ScImportSourceDesc& rDesc ) = 0; + virtual void GetValues( ScImportSourceDesc& rDesc ) = 0; }; class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog //add for ScDataPilotSourceTypeDlg { public: - virtual BOOL IsDatabase() const = 0; - virtual BOOL IsExternal() const = 0; + virtual BOOL IsDatabase() const = 0; + virtual BOOL IsExternal() const = 0; }; class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg { public: - virtual String GetServiceName() const = 0; - virtual String GetParSource() const = 0 ; - virtual String GetParName() const = 0 ; - virtual String GetParUser() const = 0; - virtual String GetParPass() const = 0; + virtual String GetServiceName() const = 0; + virtual String GetParSource() const = 0 ; + virtual String GetParName() const = 0 ; + virtual String GetParUser() const = 0; + virtual String GetParPass() const = 0; }; class AbstractScDeleteCellDlg : public VclAbstractDialog //add for ScDeleteCellDlg @@ -116,21 +116,21 @@ public: class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg { public: - virtual void DisableObjects() = 0 ; - virtual USHORT GetDelContentsCmdBits() const = 0; + virtual void DisableObjects() = 0 ; + virtual USHORT GetDelContentsCmdBits() const = 0; }; class AbstractScFillSeriesDlg: public VclAbstractDialog //add for ScFillSeriesDlg { public: - virtual FillDir GetFillDir() const = 0; - virtual FillCmd GetFillCmd() const = 0; - virtual FillDateCmd GetFillDateCmd() const = 0; - virtual double GetStart() const = 0; - virtual double GetStep() const = 0; - virtual double GetMax() const = 0; - virtual String GetStartStr() const = 0; - virtual void SetEdStartValEnabled(BOOL bFlag=FALSE) = 0; + virtual FillDir GetFillDir() const = 0; + virtual FillCmd GetFillCmd() const = 0; + virtual FillDateCmd GetFillDateCmd() const = 0; + virtual double GetStart() const = 0; + virtual double GetStep() const = 0; + virtual double GetMax() const = 0; + virtual String GetStartStr() const = 0; + virtual void SetEdStartValEnabled(BOOL bFlag=FALSE) = 0; }; class AbstractScGroupDlg : public VclAbstractDialog //add for ScGroupDlg @@ -148,28 +148,28 @@ public: class AbstractScInsertContentsDlg : public VclAbstractDialog //add for ScInsertContentsDlg { public: - virtual USHORT GetInsContentsCmdBits() const = 0; - virtual USHORT GetFormulaCmdBits() const = 0 ; - virtual BOOL IsSkipEmptyCells() const = 0; - virtual BOOL IsLink() const = 0; - virtual void SetFillMode( BOOL bSet ) = 0; - virtual void SetOtherDoc( BOOL bSet ) = 0; - virtual BOOL IsTranspose() const = 0; - virtual void SetChangeTrack( BOOL bSet ) = 0; - virtual void SetCellShiftDisabled( int nDisable ) = 0; - virtual InsCellCmd GetMoveMode() = 0; + virtual USHORT GetInsContentsCmdBits() const = 0; + virtual USHORT GetFormulaCmdBits() const = 0 ; + virtual BOOL IsSkipEmptyCells() const = 0; + virtual BOOL IsLink() const = 0; + virtual void SetFillMode( BOOL bSet ) = 0; + virtual void SetOtherDoc( BOOL bSet ) = 0; + virtual BOOL IsTranspose() const = 0; + virtual void SetChangeTrack( BOOL bSet ) = 0; + virtual void SetCellShiftDisabled( int nDisable ) = 0; + virtual InsCellCmd GetMoveMode() = 0; }; class AbstractScInsertTableDlg : public VclAbstractDialog //add for ScInsertTableDlg { public: - virtual BOOL GetTablesFromFile() = 0; - virtual BOOL GetTablesAsLink() = 0; - virtual const String* GetFirstTable( USHORT* pN = NULL ) = 0; - virtual ScDocShell* GetDocShellTables() = 0; - virtual BOOL IsTableBefore() = 0; - virtual USHORT GetTableCount() = 0; - virtual const String* GetNextTable( USHORT* pN = NULL ) = 0; + virtual BOOL GetTablesFromFile() = 0; + virtual BOOL GetTablesAsLink() = 0; + virtual const String* GetFirstTable( USHORT* pN = NULL ) = 0; + virtual ScDocShell* GetDocShellTables() = 0; + virtual BOOL IsTableBefore() = 0; + virtual USHORT GetTableCount() = 0; + virtual const String* GetNextTable( USHORT* pN = NULL ) = 0; }; @@ -182,14 +182,14 @@ public: class AbstractScLinkedAreaDlg : public VclAbstractDialog2 //add for ScLinkedAreaDlg { public: - virtual void InitFromOldLink( const String& rFile, const String& rFilter, + virtual void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ) = 0; - virtual String GetURL() = 0; - virtual String GetFilter() = 0; // may be empty - virtual String GetOptions() = 0; // filter options - virtual String GetSource() = 0; // separated by ";" - virtual ULONG GetRefresh() = 0; // 0 if disabled + virtual String GetURL() = 0; + virtual String GetFilter() = 0; // may be empty + virtual String GetOptions() = 0; // filter options + virtual String GetSource() = 0; // separated by ";" + virtual ULONG GetRefresh() = 0; // 0 if disabled }; class AbstractScMetricInputDlg : public VclAbstractDialog //add for ScMetricInputDlg @@ -201,29 +201,29 @@ public: class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDlg { public: - virtual USHORT GetSelectedDocument () const = 0; - virtual USHORT GetSelectedTable () const = 0; - virtual BOOL GetCopyTable () const = 0; - virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; - virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; + virtual USHORT GetSelectedDocument () const = 0; + virtual USHORT GetSelectedTable () const = 0; + virtual BOOL GetCopyTable () const = 0; + virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; + virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; }; class AbstractScNameCreateDlg : public VclAbstractDialog //add for ScNameCreateDlg { public: - virtual USHORT GetFlags() const = 0; + virtual USHORT GetFlags() const = 0; }; class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg { public: - virtual String GetSelectedName() const = 0; + virtual String GetSelectedName() const = 0; }; class AbstractScPivotFilterDlg : public VclAbstractDialog //add for ScPivotFilterDlg { public: - virtual const ScQueryItem& GetOutputItem() = 0; + virtual const ScQueryItem& GetOutputItem() = 0; }; class AbstractScDPFunctionDlg : public VclAbstractDialog //add for ScDPFunctionDlg @@ -274,9 +274,9 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg { public: virtual void Insert( const String& rString, BOOL bSelected ) = 0; - virtual USHORT GetSelectEntryCount() const = 0; + virtual USHORT GetSelectEntryCount() const = 0; virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ) = 0; - virtual String GetSelectEntry(USHORT nPos) const = 0; + virtual String GetSelectEntry(USHORT nPos) const = 0; virtual USHORT GetSelectEntryPos(USHORT nPos) const = 0; }; @@ -309,16 +309,16 @@ public: class ScAbstractDialogFactory { public: - static ScAbstractDialogFactory* Create(); + static ScAbstractDialogFactory* Create(); - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg SvStream* pInStream, int nId, sal_Unicode cSep = '\t') = 0; virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg - ScAutoFormat* pAutoFormat, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId) = 0; @@ -327,11 +327,11 @@ public: BOOL bCol = FALSE, BOOL bRow = FALSE) = 0; - virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg - const String& rStrTitle, - const String& rStrLabel, + virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg + const String& rStrTitle, + const String& rStrLabel, int nId, - BOOL bColDefault = TRUE ) = 0; + BOOL bColDefault = TRUE ) = 0; virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg @@ -345,53 +345,53 @@ public: virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults = 0 ) = 0; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir, int nId) = 0; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg - USHORT nResId, + USHORT nResId, int nId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ) = 0; + BOOL bUnGroup = FALSE, + BOOL bRows = TRUE ) = 0; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg int nId, BOOL bDisallowCellMove = FALSE ) = 0; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg int nId, - USHORT nCheckDefaults = 0, - const String* pStrTitle = NULL ) = 0; + USHORT nCheckDefaults = 0, + const String* pStrTitle = NULL ) = 0; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg SCTAB nTabCount, bool bFromFile, int nId) = 0; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList, + List& aEntryList, int nId ) = 0; virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, int nId , - FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, + FieldUnit eFUnit = FUNIT_MM, + USHORT nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, long nLast = 100 ) = 0; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ) = 0; //add for ScMoveTableDlg @@ -402,7 +402,7 @@ public: int nId , BOOL bInsList=TRUE ) = 0; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg - const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) = 0; + const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) = 0; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, const ScDPLabelDataVec& rLabelVec, @@ -449,34 +449,34 @@ public: ULONG nHelpId , int nId ) = 0; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, BOOL bAscii = TRUE, - const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const ScImportOptions* pOptions = NULL, + const String* pStrTitle = NULL, BOOL bMultiByte = FALSE, BOOL bOnlyDbtoolsEncodings = FALSE, BOOL bImport = TRUE ) = 0; - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg - Window* pParent, + virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg + Window* pParent, const SfxItemSet* pCellAttrs, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, + virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, int nId, - USHORT nResId = RID_SCDLG_HFEDIT ) = 0; + USHORT nResId = RID_SCDLG_HFEDIT ) = 0; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg - SfxStyleSheetBase& rStyleBase, - USHORT nRscId, + virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg + SfxStyleSheetBase& rStyleBase, + USHORT nRscId, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg - const SfxItemSet* pArgSet, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg + const SfxItemSet* pArgSet, int nId) = 0; virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg @@ -487,16 +487,16 @@ public: //Modified by PengYunQuan for Validity Cell Range Picker - virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg + virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg const SfxItemSet* pArgSet,int nId ) = 0; // for tabpage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; + virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; }; #endif diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 1d2304c2a0f2..ac63b938c570 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -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 @@ -43,7 +43,7 @@ class SfxFilter; class ScDLL -/* [Description] +/* [Description] This class is a wrapper for a Load-On-Demand-DLL. One instance per SfxApplication will be created for the runtime of @@ -59,16 +59,16 @@ public: ~ScDLL(); // static-init/exit-code must be linked to the application - static void LibInit(); // called from SfxApplication-subclass::Init() - static void LibExit(); // called from SfxApplication-subclass::Exit() - static void PreExit(); // muss vor LibExit gerufen werden + static void LibInit(); // called from SfxApplication-subclass::Init() + static void LibExit(); // called from SfxApplication-subclass::Exit() + static void PreExit(); // muss vor LibExit gerufen werden // DLL-init/exit-code must be linked to the DLL only - static void Init(); // called directly after loading the DLL - static void Exit(); // called directly befor unloading the DLL + static void Init(); // called directly after loading the DLL + static void Exit(); // called directly befor unloading the DLL -//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); - static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, +//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); + static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx index 4f128ed57604..2b0f57ebd7fc 100644 --- a/sc/inc/scerrors.hxx +++ b/sc/inc/scerrors.hxx @@ -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/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index ad3fd4b1b51e..7ad90f07264c 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -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/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 8188deca5f40..e32c0e3181ed 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.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 @@ -26,304 +26,304 @@ ************************************************************************/ #include "sc.hrc" -#define ID_FUNCTION_GRP_DATABASE 1 -#define ID_FUNCTION_GRP_DATETIME 2 -#define ID_FUNCTION_GRP_FINANZ 3 -#define ID_FUNCTION_GRP_INFO 4 -#define ID_FUNCTION_GRP_LOGIC 5 -#define ID_FUNCTION_GRP_MATH 6 -#define ID_FUNCTION_GRP_MATRIX 7 -#define ID_FUNCTION_GRP_STATISTIC 8 -#define ID_FUNCTION_GRP_TABLE 9 -#define ID_FUNCTION_GRP_TEXT 10 -#define ID_FUNCTION_GRP_ADDINS 11 +#define ID_FUNCTION_GRP_DATABASE 1 +#define ID_FUNCTION_GRP_DATETIME 2 +#define ID_FUNCTION_GRP_FINANZ 3 +#define ID_FUNCTION_GRP_INFO 4 +#define ID_FUNCTION_GRP_LOGIC 5 +#define ID_FUNCTION_GRP_MATH 6 +#define ID_FUNCTION_GRP_MATRIX 7 +#define ID_FUNCTION_GRP_STATISTIC 8 +#define ID_FUNCTION_GRP_TABLE 9 +#define ID_FUNCTION_GRP_TEXT 10 +#define ID_FUNCTION_GRP_ADDINS 11 -#define ID_FUNCTION_OFFSET 90 +#define ID_FUNCTION_OFFSET 90 -// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen -#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) +// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen +#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) -#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) +#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) +#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) +#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) +#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) +#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) +#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) +#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) +#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) +#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) +#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) +#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) +#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) +#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) +#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) +#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) +#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) +#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) +#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) +#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) +#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) +#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) +#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) +#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) +#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) +#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) +#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) #define HID_FUNC_EUROCONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) -#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) -#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) -#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) -#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) -#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) -#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) -#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) -#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) -#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) -#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) -#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) -#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) -#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) -#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) -#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) -#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) -#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) -#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) -#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) -#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) -#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) +#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) +#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) +#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) +#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) +#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) +#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) +#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) +#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) +#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) +#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) +#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) +#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) +#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) +#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) +#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) +#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) +#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) +#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) +#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) +#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) +#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) +#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) +#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) +#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) +#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) +#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) +#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) +#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) +#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) +#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) +#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) +#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) +#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) +#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) +#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) +#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) +#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) +#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) +#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) +#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) +#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) +#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) +#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) +#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) +#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) +#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) +#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) +#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) +#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) #define HID_FUNC_CHISQDIST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+78) #define HID_FUNC_CHISQINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+79) #define HID_FUNC_GAMMA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+80) -#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) #define HID_FUNC_GETPIVOTDATA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) #define HID_FUNC_BAHTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+28) #define HID_FUNC_JIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+29) #define HID_FUNC_ASC (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+30) diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 6788c906cb8d..dbdb5d3251de 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -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,24 +32,24 @@ #include #endif -// EditEngine darf nicht ihre eigenen ITEMID's definieren +// EditEngine darf nicht ihre eigenen ITEMID's definieren #define _EEITEMID_HXX //-------------------------- // Item-IDs fuer UI-MsgPool: //-------------------------- -//! sollten auch nach unter 1000 verschoben werden! +//! sollten auch nach unter 1000 verschoben werden! -#define MSGPOOL_START 1100 +#define MSGPOOL_START 1100 //-------------------------------------- -#define SCITEM_STRING 1100 -#define SCITEM_SEARCHDATA 1101 -#define SCITEM_SORTDATA 1102 -#define SCITEM_QUERYDATA 1103 -#define SCITEM_SUBTDATA 1104 +#define SCITEM_STRING 1100 +#define SCITEM_SEARCHDATA 1101 +#define SCITEM_SORTDATA 1102 +#define SCITEM_QUERYDATA 1103 +#define SCITEM_SUBTDATA 1104 #define SCITEM_CONSOLIDATEDATA 1105 -#define SCITEM_PIVOTDATA 1106 +#define SCITEM_PIVOTDATA 1106 #define SCITEM_SOLVEDATA 1107 #define SCITEM_USERLIST 1108 #define SCITEM_PRINTWARN 1109 @@ -59,48 +59,48 @@ //------------------------- // Item-IDs fuer Attribute: //------------------------- -#define ATTR_STARTINDEX 100 // Anfang Attribute - -#define ATTR_PATTERN_START 100 // Anfang Zellattribut-Pattern - -#define ATTR_FONT 100 // Anfang Zellattribute -#define ATTR_FONT_HEIGHT 101 -#define ATTR_FONT_WEIGHT 102 -#define ATTR_FONT_POSTURE 103 -#define ATTR_FONT_UNDERLINE 104 -#define ATTR_FONT_OVERLINE 105 -#define ATTR_FONT_CROSSEDOUT 106 -#define ATTR_FONT_CONTOUR 107 -#define ATTR_FONT_SHADOWED 108 -#define ATTR_FONT_COLOR 109 -#define ATTR_FONT_LANGUAGE 110 -#define ATTR_CJK_FONT 111 -#define ATTR_CJK_FONT_HEIGHT 112 -#define ATTR_CJK_FONT_WEIGHT 113 -#define ATTR_CJK_FONT_POSTURE 114 -#define ATTR_CJK_FONT_LANGUAGE 115 -#define ATTR_CTL_FONT 116 -#define ATTR_CTL_FONT_HEIGHT 117 -#define ATTR_CTL_FONT_WEIGHT 118 -#define ATTR_CTL_FONT_POSTURE 119 -#define ATTR_CTL_FONT_LANGUAGE 120 -#define ATTR_FONT_EMPHASISMARK 121 -#define ATTR_USERDEF 122 // not saved in binary files -#define ATTR_FONT_WORDLINE 123 -#define ATTR_FONT_RELIEF 124 -#define ATTR_HYPHENATE 125 -#define ATTR_SCRIPTSPACE 126 -#define ATTR_HANGPUNCTUATION 127 -#define ATTR_FORBIDDEN_RULES 128 -#define ATTR_HOR_JUSTIFY 129 -#define ATTR_INDENT 130 -#define ATTR_VER_JUSTIFY 131 +#define ATTR_STARTINDEX 100 // Anfang Attribute + +#define ATTR_PATTERN_START 100 // Anfang Zellattribut-Pattern + +#define ATTR_FONT 100 // Anfang Zellattribute +#define ATTR_FONT_HEIGHT 101 +#define ATTR_FONT_WEIGHT 102 +#define ATTR_FONT_POSTURE 103 +#define ATTR_FONT_UNDERLINE 104 +#define ATTR_FONT_OVERLINE 105 +#define ATTR_FONT_CROSSEDOUT 106 +#define ATTR_FONT_CONTOUR 107 +#define ATTR_FONT_SHADOWED 108 +#define ATTR_FONT_COLOR 109 +#define ATTR_FONT_LANGUAGE 110 +#define ATTR_CJK_FONT 111 +#define ATTR_CJK_FONT_HEIGHT 112 +#define ATTR_CJK_FONT_WEIGHT 113 +#define ATTR_CJK_FONT_POSTURE 114 +#define ATTR_CJK_FONT_LANGUAGE 115 +#define ATTR_CTL_FONT 116 +#define ATTR_CTL_FONT_HEIGHT 117 +#define ATTR_CTL_FONT_WEIGHT 118 +#define ATTR_CTL_FONT_POSTURE 119 +#define ATTR_CTL_FONT_LANGUAGE 120 +#define ATTR_FONT_EMPHASISMARK 121 +#define ATTR_USERDEF 122 // not saved in binary files +#define ATTR_FONT_WORDLINE 123 +#define ATTR_FONT_RELIEF 124 +#define ATTR_HYPHENATE 125 +#define ATTR_SCRIPTSPACE 126 +#define ATTR_HANGPUNCTUATION 127 +#define ATTR_FORBIDDEN_RULES 128 +#define ATTR_HOR_JUSTIFY 129 +#define ATTR_INDENT 130 +#define ATTR_VER_JUSTIFY 131 #define ATTR_STACKED 132 -#define ATTR_ROTATE_VALUE 133 -#define ATTR_ROTATE_MODE 134 -#define ATTR_VERTICAL_ASIAN 135 -#define ATTR_WRITINGDIR 136 -#define ATTR_LINEBREAK 137 +#define ATTR_ROTATE_VALUE 133 +#define ATTR_ROTATE_MODE 134 +#define ATTR_VERTICAL_ASIAN 135 +#define ATTR_WRITINGDIR 136 +#define ATTR_LINEBREAK 137 #define ATTR_SHRINKTOFIT 138 #define ATTR_BORDER_TLBR 139 #define ATTR_BORDER_BLTR 140 @@ -168,26 +168,26 @@ //-------------------------------- // Dummy Slot-IDs fuer Dialoge //-------------------------------- -#define SID_SCATTR_PAGE_NOTES ATTR_PAGE_NOTES -#define SID_SCATTR_PAGE_GRID ATTR_PAGE_GRID -#define SID_SCATTR_PAGE_HEADERS ATTR_PAGE_HEADERS -#define SID_SCATTR_PAGE_CHARTS ATTR_PAGE_CHARTS -#define SID_SCATTR_PAGE_OBJECTS ATTR_PAGE_OBJECTS -#define SID_SCATTR_PAGE_DRAWINGS ATTR_PAGE_DRAWINGS -#define SID_SCATTR_PAGE_TOPDOWN ATTR_PAGE_TOPDOWN -#define SID_SCATTR_PAGE_SCALE ATTR_PAGE_SCALE -#define SID_SCATTR_PAGE_SCALETOPAGES ATTR_PAGE_SCALETOPAGES -#define SID_SCATTR_PAGE_FIRSTPAGENO ATTR_PAGE_FIRSTPAGENO -#define SID_SCATTR_PAGE_PRINTAREA ATTR_PAGE_PRINTAREA -#define SID_SCATTR_PAGE_REPEATROW ATTR_PAGE_REPEATROW -#define SID_SCATTR_PAGE_REPEATCOL ATTR_PAGE_REPEATCOL -#define SID_SCATTR_PAGE_PRINTTABLES ATTR_PAGE_PRINTTABLES -#define SID_SCATTR_PAGE_HEADERLEFT ATTR_PAGE_HEADERLEFT -#define SID_SCATTR_PAGE_FOOTERLEFT ATTR_PAGE_FOOTERLEFT -#define SID_SCATTR_PAGE_HEADERRIGHT ATTR_PAGE_HEADERRIGHT -#define SID_SCATTR_PAGE_FOOTERRIGHT ATTR_PAGE_FOOTERRIGHT -#define SID_SCATTR_PAGE_FORMULAS ATTR_PAGE_FORMULAS -#define SID_SCATTR_PAGE_NULLVALS ATTR_PAGE_NULLVALS +#define SID_SCATTR_PAGE_NOTES ATTR_PAGE_NOTES +#define SID_SCATTR_PAGE_GRID ATTR_PAGE_GRID +#define SID_SCATTR_PAGE_HEADERS ATTR_PAGE_HEADERS +#define SID_SCATTR_PAGE_CHARTS ATTR_PAGE_CHARTS +#define SID_SCATTR_PAGE_OBJECTS ATTR_PAGE_OBJECTS +#define SID_SCATTR_PAGE_DRAWINGS ATTR_PAGE_DRAWINGS +#define SID_SCATTR_PAGE_TOPDOWN ATTR_PAGE_TOPDOWN +#define SID_SCATTR_PAGE_SCALE ATTR_PAGE_SCALE +#define SID_SCATTR_PAGE_SCALETOPAGES ATTR_PAGE_SCALETOPAGES +#define SID_SCATTR_PAGE_FIRSTPAGENO ATTR_PAGE_FIRSTPAGENO +#define SID_SCATTR_PAGE_PRINTAREA ATTR_PAGE_PRINTAREA +#define SID_SCATTR_PAGE_REPEATROW ATTR_PAGE_REPEATROW +#define SID_SCATTR_PAGE_REPEATCOL ATTR_PAGE_REPEATCOL +#define SID_SCATTR_PAGE_PRINTTABLES ATTR_PAGE_PRINTTABLES +#define SID_SCATTR_PAGE_HEADERLEFT ATTR_PAGE_HEADERLEFT +#define SID_SCATTR_PAGE_FOOTERLEFT ATTR_PAGE_FOOTERLEFT +#define SID_SCATTR_PAGE_HEADERRIGHT ATTR_PAGE_HEADERRIGHT +#define SID_SCATTR_PAGE_FOOTERRIGHT ATTR_PAGE_FOOTERRIGHT +#define SID_SCATTR_PAGE_FORMULAS ATTR_PAGE_FORMULAS +#define SID_SCATTR_PAGE_NULLVALS ATTR_PAGE_NULLVALS #define SID_SCATTR_PAGE_SCALETO ATTR_PAGE_SCALETO #endif diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 9857d675b7ab..9163d6ad3add 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -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 @@ -99,6 +99,7 @@ class SC_DLLPUBLIC ScMatrix mutable ULONG nRefCnt; // reference count SCSIZE nColCount; SCSIZE nRowCount; + bool mbCloneIfConst; // Whether the matrix is cloned with a CloneIfConst() call. void ResetIsString(); void DeleteIsString(); @@ -171,14 +172,22 @@ public: /** If nC*nR results in more than GetElementsMax() entries, a 1x1 matrix is created instead and a double error value (errStackOverflow) is set. Compare nC and nR with a GetDimensions() call to check. */ - ScMatrix( SCSIZE nC, SCSIZE nR) : nRefCnt(0) { CreateMatrix( nC, nR); } + ScMatrix( SCSIZE nC, SCSIZE nR) : nRefCnt(0), mbCloneIfConst(true) { CreateMatrix( nC, nR); } /** Clone the matrix. */ ScMatrix* Clone() const; - /** + /** Clone the matrix if mbCloneIfConst (immutable) is set, otherwise + return _this_ matrix, to be assigned to a ScMatrixRef. */ + ScMatrix* CloneIfConst(); + + /** Set the matrix to (im)mutable for CloneIfConst(), only the interpreter + should do this and know the consequences. */ + inline void SetImmutable( bool bVal ) { mbCloneIfConst = bVal; } + + /** * Resize the matrix to specified new dimension. Note that this operation - * clears all stored values. + * clears all stored values. */ void Resize( SCSIZE nC, SCSIZE nR); @@ -335,7 +344,7 @@ public: /// @return if string or empty or empty path, in fact non-value. BOOL IsString( SCSIZE nC, SCSIZE nR ) const - { + { ValidColRowReplicated( nC, nR ); return mnValType && IsNonValueType( mnValType[ nC * nRowCount + nR ]); } diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index bd5d40709cd4..6bbcff0d17fa 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -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,8 +32,8 @@ #include "scdll.hxx" #include #include -#include "global.hxx" // ScInputMode -#include "markdata.hxx" //ScMarkData +#include "global.hxx" // ScInputMode +#include "markdata.hxx" //ScMarkData #include "shellids.hxx" #include #include @@ -88,28 +88,28 @@ class ScFormEditData; //================================================================== -// for internal Drag&Drop: +// for internal Drag&Drop: -#define SC_DROP_NAVIGATOR 1 -#define SC_DROP_TABLE 2 +#define SC_DROP_NAVIGATOR 1 +#define SC_DROP_TABLE 2 struct ScDragData { - ScTransferObj* pCellTransfer; - ScDrawTransferObj* pDrawTransfer; - - String aLinkDoc; - String aLinkTable; - String aLinkArea; - ScDocument* pJumpLocalDoc; - String aJumpTarget; - String aJumpText; + ScTransferObj* pCellTransfer; + ScDrawTransferObj* pDrawTransfer; + + String aLinkDoc; + String aLinkTable; + String aLinkArea; + ScDocument* pJumpLocalDoc; + String aJumpTarget; + String aJumpText; }; struct ScClipData { - ScTransferObj* pCellClipboard; - ScDrawTransferObj* pDrawClipboard; + ScTransferObj* pCellClipboard; + ScDrawTransferObj* pDrawClipboard; }; //================================================================== @@ -117,31 +117,31 @@ struct ScClipData class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener { - Timer aIdleTimer; - Timer aSpellTimer; - ScDragData aDragData; - ScClipData aClipData; + Timer aIdleTimer; + Timer aSpellTimer; + ScDragData aDragData; + ScClipData aClipData; ScSelectionTransferObj* pSelTransfer; ScMessagePool* pMessagePool; - // globalen InputHandler gibt's nicht mehr, jede View hat einen + // globalen InputHandler gibt's nicht mehr, jede View hat einen ScInputHandler* pRefInputHandler; - ScViewCfg* pViewCfg; - ScDocCfg* pDocCfg; + ScViewCfg* pViewCfg; + ScDocCfg* pDocCfg; ScAppCfg* pAppCfg; - ScInputCfg* pInputCfg; - ScPrintCfg* pPrintCfg; - ScNavipiCfg* pNavipiCfg; + ScInputCfg* pInputCfg; + ScPrintCfg* pPrintCfg; + ScNavipiCfg* pNavipiCfg; ScAddInCfg* pAddInCfg; svtools::ColorConfig* pColorConfig; SvtAccessibilityOptions* pAccessOptions; - SvtCTLOptions* pCTLOptions; + SvtCTLOptions* pCTLOptions; SvtUserOptions* pUserOptions; - SfxErrorHandler* pErrorHdl; - SvxErrorHandler* pSvxErrorHdl; - ScFormEditData* pFormEditData; - USHORT nCurRefDlgId; - BOOL bIsWaterCan; - BOOL bIsInEditCommand; + SfxErrorHandler* pErrorHdl; + SvxErrorHandler* pSvxErrorHdl; + ScFormEditData* pFormEditData; + USHORT nCurRefDlgId; + BOOL bIsWaterCan; + BOOL bIsInEditCommand; BOOL bIsInExecuteDrop; bool mbIsInSharedDocLoading; bool mbIsInSharedDocSaving; @@ -153,129 +153,129 @@ public: SFX_DECL_INTERFACE(SCID_APP) ScModule( SfxObjectFactory* pFact ); - virtual ~ScModule(); + virtual ~ScModule(); - virtual void FillStatusBar(StatusBar &rBar); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - void DeleteCfg(); + virtual void FillStatusBar(StatusBar &rBar); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + void DeleteCfg(); // von der Applikation verschoben: - DECL_LINK( IdleHandler, Timer* ); // Timer statt idle - DECL_LINK( SpellTimerHdl, Timer* ); + DECL_LINK( IdleHandler, Timer* ); // Timer statt idle + DECL_LINK( SpellTimerHdl, Timer* ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); - void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); void HideDisabledSlots( SfxItemSet& rSet ); - void AnythingChanged(); + void AnythingChanged(); - // Drag & Drop: - const ScDragData& GetDragData() const { return aDragData; } - void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); - void ResetDragObject(); - void SetDragLink( const String& rDoc, const String& rTab, const String& rArea ); - void SetDragJump( ScDocument* pLocalDoc, + // Drag & Drop: + const ScDragData& GetDragData() const { return aDragData; } + void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); + void ResetDragObject(); + void SetDragLink( const String& rDoc, const String& rTab, const String& rArea ); + void SetDragJump( ScDocument* pLocalDoc, const String& rTarget, const String& rText ); - // clipboard: - const ScClipData& GetClipData() const { return aClipData; } - void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); + // clipboard: + const ScClipData& GetClipData() const { return aClipData; } + void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); - ScDocument* GetClipDoc(); // called from document - should be removed later + ScDocument* GetClipDoc(); // called from document - should be removed later - // X selection: - ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } - void SetSelectionTransfer( ScSelectionTransferObj* pNew ); + // X selection: + ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } + void SetSelectionTransfer( ScSelectionTransferObj* pNew ); - void SetWaterCan( BOOL bNew ) { bIsWaterCan = bNew; } - BOOL GetIsWaterCan() const { return bIsWaterCan; } + void SetWaterCan( BOOL bNew ) { bIsWaterCan = bNew; } + BOOL GetIsWaterCan() const { return bIsWaterCan; } - void SetInEditCommand( BOOL bNew ) { bIsInEditCommand = bNew; } - BOOL IsInEditCommand() const { return bIsInEditCommand; } + void SetInEditCommand( BOOL bNew ) { bIsInEditCommand = bNew; } + BOOL IsInEditCommand() const { return bIsInEditCommand; } void SetInExecuteDrop( BOOL bNew ) { bIsInExecuteDrop = bNew; } BOOL IsInExecuteDrop() const { return bIsInExecuteDrop; } // Options: - const ScViewOptions& GetViewOptions (); - const ScDocOptions& GetDocOptions (); -SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); - const ScInputOptions& GetInputOptions (); -SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); - void SetViewOptions ( const ScViewOptions& rOpt ); - void SetDocOptions ( const ScDocOptions& rOpt ); -SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); - void SetInputOptions ( const ScInputOptions& rOpt ); - void SetPrintOptions ( const ScPrintOptions& rOpt ); - void InsertEntryToLRUList(USHORT nFIndex); - void RecentFunctionsChanged(); - - static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, + const ScViewOptions& GetViewOptions (); + const ScDocOptions& GetDocOptions (); +SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); + const ScInputOptions& GetInputOptions (); +SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); + void SetViewOptions ( const ScViewOptions& rOpt ); + void SetDocOptions ( const ScDocOptions& rOpt ); +SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); + void SetInputOptions ( const ScInputOptions& rOpt ); + void SetPrintOptions ( const ScPrintOptions& rOpt ); + void InsertEntryToLRUList(USHORT nFIndex); + void RecentFunctionsChanged(); + + static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, BOOL& rAutoSpell ); - static void SetAutoSpellProperty( BOOL bSet ); - static BOOL HasThesaurusLanguage( USHORT nLang ); + static void SetAutoSpellProperty( BOOL bSet ); + static BOOL HasThesaurusLanguage( USHORT nLang ); - USHORT GetOptDigitLanguage(); // from CTL options + USHORT GetOptDigitLanguage(); // from CTL options - ScNavipiCfg& GetNavipiCfg(); + ScNavipiCfg& GetNavipiCfg(); ScAddInCfg& GetAddInCfg(); svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessOptions(); - SvtCTLOptions& GetCTLOptions(); + SvtCTLOptions& GetCTLOptions(); SvtUserOptions& GetUserOptions(); - void ModifyOptions( const SfxItemSet& rOptSet ); + void ModifyOptions( const SfxItemSet& rOptSet ); - // InputHandler: - BOOL IsEditMode(); // nicht bei SC_INPUT_TYPE - BOOL IsInputMode(); // auch bei SC_INPUT_TYPE + // InputHandler: + BOOL IsEditMode(); // nicht bei SC_INPUT_TYPE + BOOL IsInputMode(); // auch bei SC_INPUT_TYPE void SetInputMode( ScInputMode eMode ); BOOL InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); SC_DLLPUBLIC void InputEnterHandler( BYTE nBlockMode = 0 ); void InputCancelHandler(); void InputSelection( EditView* pView ); void InputChanged( EditView* pView ); - ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE ); + ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE ); - void SetRefInputHdl( ScInputHandler* pNew ); - ScInputHandler* GetRefInputHdl(); + void SetRefInputHdl( ScInputHandler* pNew ); + ScInputHandler* GetRefInputHdl(); - void ViewShellGone(ScTabViewShell* pViewSh); - void ViewShellChanged(); + void ViewShellGone(ScTabViewShell* pViewSh); + void ViewShellChanged(); // Kommunikation mit Funktionsautopilot - void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ); - void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection( const String& rStr ); - String InputGetFormulaStr(); - void ActivateInputWindow( const String* pStr = NULL, + void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ); + void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ); + void InputReplaceSelection( const String& rStr ); + String InputGetFormulaStr(); + void ActivateInputWindow( const String* pStr = NULL, BOOL bMatrix = FALSE ); - void InitFormEditData(); - void ClearFormEditData(); - ScFormEditData* GetFormEditData() { return pFormEditData; } + void InitFormEditData(); + void ClearFormEditData(); + ScFormEditData* GetFormEditData() { return pFormEditData; } - // Referenzeingabe: + // Referenzeingabe: //Added by PengYunQuan for Validity Cell Range Picker BOOL IsModalMode(SfxObjectShell* pDocSh = NULL); BOOL IsFormulaMode(); BOOL IsRefDialogOpen(); - BOOL IsTableLocked(); - void SetReference( const ScRange& rRef, ScDocument* pDoc, + BOOL IsTableLocked(); + void SetReference( const ScRange& rRef, ScDocument* pDoc, const ScMarkData* pMarkData = NULL ); - void AddRefEntry(); + void AddRefEntry(); void EndReference(); - USHORT GetCurRefDlgId() const { return nCurRefDlgId; } + USHORT GetCurRefDlgId() const { return nCurRefDlgId; } //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( USHORT nId ); + virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index 067e5f03e307..a8edf87a11ad 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -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 @@ -36,7 +36,7 @@ class SC_DLLPUBLIC ScResId : public ResId { public: - ScResId( USHORT nId ); // in scdll.cxx + ScResId( USHORT nId ); // in scdll.cxx }; diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx index e823a66f7a80..150fee8870c4 100644 --- a/sc/inc/scwarngs.hxx +++ b/sc/inc/scwarngs.hxx @@ -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 @@ -29,7 +29,7 @@ #define __SCWARNGS_HXX_ #define ERRCODE_SC_EXPORT_WRN_ASCII (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_WRITE | 1) -#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1) +#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1) #endif diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index 195331c750ad..9f1d0303e7f6 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -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/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index 4f2f1ec40de2..a09b1c354e99 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -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 @@ -35,50 +35,50 @@ class String; class ScDocShell; -//! AutoFormat wirklich hier oder besser global?????? - -#define SC_SERVICE_SHEET 0 -#define SC_SERVICE_URLFIELD 1 -#define SC_SERVICE_PAGEFIELD 2 -#define SC_SERVICE_PAGESFIELD 3 -#define SC_SERVICE_DATEFIELD 4 -#define SC_SERVICE_TIMEFIELD 5 -#define SC_SERVICE_TITLEFIELD 6 -#define SC_SERVICE_FILEFIELD 7 -#define SC_SERVICE_SHEETFIELD 8 -#define SC_SERVICE_CELLSTYLE 9 -#define SC_SERVICE_PAGESTYLE 10 -#define SC_SERVICE_AUTOFORMAT 11 -#define SC_SERVICE_CELLRANGES 12 - -// drawing layer tables -#define SC_SERVICE_GRADTAB 13 -#define SC_SERVICE_HATCHTAB 14 -#define SC_SERVICE_BITMAPTAB 15 -#define SC_SERVICE_TRGRADTAB 16 -#define SC_SERVICE_MARKERTAB 17 -#define SC_SERVICE_DASHTAB 18 -#define SC_SERVICE_NUMRULES 19 - -#define SC_SERVICE_DOCDEFLTS 20 -#define SC_SERVICE_DRAWDEFLTS 21 - -#define SC_SERVICE_DOCSPRSETT 22 -#define SC_SERVICE_DOCCONF 23 - -#define SC_SERVICE_IMAP_RECT 24 -#define SC_SERVICE_IMAP_CIRC 25 -#define SC_SERVICE_IMAP_POLY 26 +//! AutoFormat wirklich hier oder besser global?????? + +#define SC_SERVICE_SHEET 0 +#define SC_SERVICE_URLFIELD 1 +#define SC_SERVICE_PAGEFIELD 2 +#define SC_SERVICE_PAGESFIELD 3 +#define SC_SERVICE_DATEFIELD 4 +#define SC_SERVICE_TIMEFIELD 5 +#define SC_SERVICE_TITLEFIELD 6 +#define SC_SERVICE_FILEFIELD 7 +#define SC_SERVICE_SHEETFIELD 8 +#define SC_SERVICE_CELLSTYLE 9 +#define SC_SERVICE_PAGESTYLE 10 +#define SC_SERVICE_AUTOFORMAT 11 +#define SC_SERVICE_CELLRANGES 12 + +// drawing layer tables +#define SC_SERVICE_GRADTAB 13 +#define SC_SERVICE_HATCHTAB 14 +#define SC_SERVICE_BITMAPTAB 15 +#define SC_SERVICE_TRGRADTAB 16 +#define SC_SERVICE_MARKERTAB 17 +#define SC_SERVICE_DASHTAB 18 +#define SC_SERVICE_NUMRULES 19 + +#define SC_SERVICE_DOCDEFLTS 20 +#define SC_SERVICE_DRAWDEFLTS 21 + +#define SC_SERVICE_DOCSPRSETT 22 +#define SC_SERVICE_DOCCONF 23 + +#define SC_SERVICE_IMAP_RECT 24 +#define SC_SERVICE_IMAP_CIRC 25 +#define SC_SERVICE_IMAP_POLY 26 // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver -#define SC_SERVICE_EXPORT_GOR 27 -#define SC_SERVICE_IMPORT_GOR 28 -#define SC_SERVICE_EXPORT_EOR 29 -#define SC_SERVICE_IMPORT_EOR 30 +#define SC_SERVICE_EXPORT_GOR 27 +#define SC_SERVICE_IMPORT_GOR 28 +#define SC_SERVICE_EXPORT_EOR 29 +#define SC_SERVICE_IMPORT_EOR 30 -#define SC_SERVICE_VALBIND 31 -#define SC_SERVICE_LISTCELLBIND 32 -#define SC_SERVICE_LISTSOURCE 33 +#define SC_SERVICE_VALBIND 31 +#define SC_SERVICE_LISTCELLBIND 32 +#define SC_SERVICE_LISTSOURCE 33 #define SC_SERVICE_CELLADDRESS 34 #define SC_SERVICE_RANGEADDRESS 35 @@ -95,10 +95,10 @@ class ScDocShell; // VBA specific #define SC_SERVICE_VBAOBJECTPROVIDER 40 #define SC_SERVICE_VBACODENAMEPROVIDER 41 -#define SC_SERVICE_VBAGLOBALS 42 +#define SC_SERVICE_VBAGLOBALS 42 #define SC_SERVICE_COUNT 43 -#define SC_SERVICE_INVALID USHRT_MAX +#define SC_SERVICE_INVALID USHRT_MAX class ScServiceProvider @@ -109,7 +109,7 @@ public: MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); static ::com::sun::star::uno::Sequence GetAllServiceNames(); //UNUSED2008-05 static String GetProviderName(sal_uInt16 nObjectType); - static sal_uInt16 GetProviderType(const String& rServiceName); + static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index ddbbf3108daf..a80ad3cd9095 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -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 @@ -55,8 +55,8 @@ class ShapeUnoEventAccessImpl; //------------------------------------------------------------------------ -// object which aggregates all svx shape objects, -// to add own properties +// object which aggregates all svx shape objects, +// to add own properties typedef ::cppu::WeakImplHelper5 < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XPropertyState @@ -76,7 +76,7 @@ private: ::com::sun::star::beans::XPropertyState* pShapePropertyState; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo; com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId; - BOOL bIsTextShape; + BOOL bIsTextShape; bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); @@ -92,20 +92,20 @@ public: // ctor modifies xShape parameter ScShapeObj( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); - virtual ~ScShapeObj(); + virtual ~ScShapeObj(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -117,25 +117,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -152,7 +152,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -162,7 +162,7 @@ public: ::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -170,23 +170,23 @@ public: getAnchor(void) throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -198,11 +198,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -216,7 +216,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index de67786ff9fe..7e2c291d2207 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -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/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index bb27f5cf2068..772908f2ec83 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -1,7 +1,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 @@ -53,7 +53,7 @@ public: ScSheetEvents(const ScSheetEvents& rOther); ~ScSheetEvents(); - const ScSheetEvents& operator= (const ScSheetEvents& rOther); + const ScSheetEvents& operator= (const ScSheetEvents& rOther); const rtl::OUString* GetScript(sal_Int32 nEvent) const; void SetScript(sal_Int32 nEvent, const rtl::OUString* pNew); diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxx index 7f4ccb60259f..c4ebfe0e5722 100644 --- a/sc/inc/shellids.hxx +++ b/sc/inc/shellids.hxx @@ -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 @@ -29,25 +29,25 @@ #define SC_SHELLIDS_HXX // Sfx Interface-IDs -#define SCID_APP (SFX_INTERFACE_SC_START+0) -#define SCID_DOC_SHELL (SFX_INTERFACE_SC_START+1) -#define SCID_TABVIEW_SHELL (SFX_INTERFACE_SC_START+2) -#define SCID_TABPOP_SHELL (SFX_INTERFACE_SC_START+3) -#define SCID_EDIT_SHELL (SFX_INTERFACE_SC_START+4) -#define SCID_DRAW_SHELL (SFX_INTERFACE_SC_START+5) -#define SCID_DRAW_TEXT_SHELL (SFX_INTERFACE_SC_START+6) +#define SCID_APP (SFX_INTERFACE_SC_START+0) +#define SCID_DOC_SHELL (SFX_INTERFACE_SC_START+1) +#define SCID_TABVIEW_SHELL (SFX_INTERFACE_SC_START+2) +#define SCID_TABPOP_SHELL (SFX_INTERFACE_SC_START+3) +#define SCID_EDIT_SHELL (SFX_INTERFACE_SC_START+4) +#define SCID_DRAW_SHELL (SFX_INTERFACE_SC_START+5) +#define SCID_DRAW_TEXT_SHELL (SFX_INTERFACE_SC_START+6) #define SCID_PREVIEW_SHELL (SFX_INTERFACE_SC_START+7) #define SCID_PIVOT_SHELL (SFX_INTERFACE_SC_START+8) #define SCID_AUDITING_SHELL (SFX_INTERFACE_SC_START+9) -#define SCID_FORM_SHELL (SFX_INTERFACE_SC_START+10) +#define SCID_FORM_SHELL (SFX_INTERFACE_SC_START+10) -#define SCID_FORMAT_SHELL (SFX_INTERFACE_SC_START+11) -#define SCID_CELL_SHELL (SFX_INTERFACE_SC_START+12) -#define SCID_OLEOBJECT_SHELL (SFX_INTERFACE_SC_START+13) -#define SCID_CHART_SHELL (SFX_INTERFACE_SC_START+14) -#define SCID_GRAPHIC_SHELL (SFX_INTERFACE_SC_START+15) -#define SCID_PAGEBREAK_SHELL (SFX_INTERFACE_SC_START+16) -#define SCID_MEDIA_SHELL (SFX_INTERFACE_SC_START+17) +#define SCID_FORMAT_SHELL (SFX_INTERFACE_SC_START+11) +#define SCID_CELL_SHELL (SFX_INTERFACE_SC_START+12) +#define SCID_OLEOBJECT_SHELL (SFX_INTERFACE_SC_START+13) +#define SCID_CHART_SHELL (SFX_INTERFACE_SC_START+14) +#define SCID_GRAPHIC_SHELL (SFX_INTERFACE_SC_START+15) +#define SCID_PAGEBREAK_SHELL (SFX_INTERFACE_SC_START+16) +#define SCID_MEDIA_SHELL (SFX_INTERFACE_SC_START+17) #endif diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 650293893678..5d7a0986eaf7 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -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 @@ -34,7 +34,7 @@ #include #include "scdllapi.h" -#define MAXSORT 3 +#define MAXSORT 3 struct ScSubTotalParam; @@ -42,26 +42,26 @@ struct ScQueryParam; struct SC_DLLPUBLIC ScSortParam { - SCCOL nCol1; - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bHasHeader; - BOOL bByRow; - BOOL bCaseSens; - BOOL bUserDef; - USHORT nUserIndex; - BOOL bIncludePattern; - BOOL bInplace; - SCTAB nDestTab; - SCCOL nDestCol; - SCROW nDestRow; - BOOL bDoSort[MAXSORT]; - SCCOLROW nField[MAXSORT]; - BOOL bAscending[MAXSORT]; - ::com::sun::star::lang::Locale aCollatorLocale; - String aCollatorAlgorithm; - USHORT nCompatHeader; + SCCOL nCol1; + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bHasHeader; + BOOL bByRow; + BOOL bCaseSens; + BOOL bUserDef; + USHORT nUserIndex; + BOOL bIncludePattern; + BOOL bInplace; + SCTAB nDestTab; + SCCOL nDestCol; + SCROW nDestRow; + BOOL bDoSort[MAXSORT]; + SCCOLROW nField[MAXSORT]; + BOOL bAscending[MAXSORT]; + ::com::sun::star::lang::Locale aCollatorLocale; + String aCollatorAlgorithm; + USHORT nCompatHeader; ScSortParam(); ScSortParam( const ScSortParam& r ); @@ -70,11 +70,11 @@ struct SC_DLLPUBLIC ScSortParam /// TopTen sort ScSortParam( const ScQueryParam&, SCCOL nCol ); - ScSortParam& operator= ( const ScSortParam& r ); - BOOL operator== ( const ScSortParam& rOther ) const; - void Clear (); + ScSortParam& operator= ( const ScSortParam& r ); + BOOL operator== ( const ScSortParam& rOther ) const; + void Clear (); - void MoveToDest(); + void MoveToDest(); }; diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index f8f82ed25aff..27e55b3132d4 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -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 @@ -44,23 +44,23 @@ class ScCellSearchObj : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; - SvxSearchItem* pSearchItem; + SfxItemPropertySet aPropSet; + SvxSearchItem* pSearchItem; public: ScCellSearchObj(); - virtual ~ScCellSearchObj(); + virtual ~ScCellSearchObj(); - SvxSearchItem* GetSearchItem() const { return pSearchItem; } + SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor virtual ::rtl::OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) + virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); // XSearchDescriptor virtual ::rtl::OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // Search/Replace muss von aussen (vom XSearchable) gerufen werden... @@ -69,7 +69,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -81,25 +81,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 946a861231d9..3cd66e4a3bb5 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -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 @@ -37,50 +37,50 @@ class ScDocument; class ScStyleSheetPool : public SfxStyleSheetPool { public: - ScStyleSheetPool( SfxItemPool& rPool, - ScDocument* pDocument ); + ScStyleSheetPool( SfxItemPool& rPool, + ScDocument* pDocument ); - void SetDocument( ScDocument* pDocument ); - ScDocument* GetDocument() const { return pDoc; } + void SetDocument( ScDocument* pDocument ); + ScDocument* GetDocument() const { return pDoc; } - virtual void Remove( SfxStyleSheetBase* pStyle ); + virtual void Remove( SfxStyleSheetBase* pStyle ); - void SetActualStyleSheet ( SfxStyleSheetBase* pActStyleSheet ) + void SetActualStyleSheet ( SfxStyleSheetBase* pActStyleSheet ) { pActualStyleSheet = pActStyleSheet; } - SfxStyleSheetBase* GetActualStyleSheet () + SfxStyleSheetBase* GetActualStyleSheet () { return pActualStyleSheet; } - void CreateStandardStyles(); - void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); -//UNUSED2008-05 void UpdateStdNames(); + void CreateStandardStyles(); + void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); +//UNUSED2008-05 void UpdateStdNames(); - void CopyStyleFrom( ScStyleSheetPool* pSrcPool, + void CopyStyleFrom( ScStyleSheetPool* pSrcPool, const String& rName, SfxStyleFamily eFamily ); - ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); + ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); -//UNUSED2009-05 void SetForceStdName( const String* pSet ); - const String* GetForceStdName() const { return pForceStdName; } +//UNUSED2009-05 void SetForceStdName( const String* pSet ); + const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, USHORT nMask = 0xffff, USHORT nPos = 0xffff ); protected: - virtual ~ScStyleSheetPool(); + virtual ~ScStyleSheetPool(); using SfxStyleSheetPool::Create; // calcwarnings: Create(const SfxStyleSheet&) - ever used? - virtual SfxStyleSheetBase* Create( const String& rName, - SfxStyleFamily eFamily, - USHORT nMask); + virtual SfxStyleSheetBase* Create( const String& rName, + SfxStyleFamily eFamily, + USHORT nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ); private: - SfxStyleSheetBase* pActualStyleSheet; - ScDocument* pDoc; - const String* pForceStdName; + SfxStyleSheetBase* pActualStyleSheet; + ScDocument* pDoc; + const String* pForceStdName; }; -#endif // SC_STLPOOL_HXX +#endif // SC_STLPOOL_HXX diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 4e42be6e2563..aabaeb61bf6f 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -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,7 +32,7 @@ //------------------------------------------------------------------------ -#define SCSTYLEBIT_STANDARD 0x0001 +#define SCSTYLEBIT_STANDARD 0x0001 //------------------------------------------------------------------------ @@ -59,11 +59,11 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual BOOL SetParent ( const String& rParentName ); - virtual SfxItemSet& GetItemSet (); - virtual BOOL IsUsed () const; - virtual BOOL HasFollowSupport () const; - virtual BOOL HasParentSupport () const; + virtual BOOL SetParent ( const String& rParentName ); + virtual SfxItemSet& GetItemSet (); + virtual BOOL IsUsed () const; + virtual BOOL HasFollowSupport () const; + virtual BOOL HasParentSupport () const; virtual const String& GetName() const; virtual const String& GetParent() const; @@ -77,15 +77,15 @@ public: { return eUsage; } protected: - virtual ~ScStyleSheet(); + virtual ~ScStyleSheet(); - ScStyleSheet( const String& rName, - ScStyleSheetPool& rPool, - SfxStyleFamily eFamily, - USHORT nMask ); + ScStyleSheet( const String& rName, + ScStyleSheetPool& rPool, + SfxStyleFamily eFamily, + USHORT nMask ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -#endif // SC_STLSHEET_HXX +#endif // SC_STLSHEET_HXX diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index c50c0d8cf156..4ca8629d901b 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -1,7 +1,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 @@ -36,16 +36,16 @@ class ScStringUtil { public: - /** - * Check if a given string is a simple decimal number (e.g. 12.345). We - * don't do any elaborate parsing here; we only check for the simplest - * case of decimal number format. + /** + * Check if a given string is a simple decimal number (e.g. 12.345). We + * don't do any elaborate parsing here; we only check for the simplest + * case of decimal number format. * * @param rStr string to parse * @param dsep decimal separator * @param gsep group separator (aka thousands separator) * @param rVal value of successfully parsed number - * + * * @return true if the string is a valid number, false otherwise. */ static bool parseSimpleNumber( diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx index 6b44d8e4e3ef..403eb6f19e31 100644 --- a/sc/inc/strload.hxx +++ b/sc/inc/strload.hxx @@ -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/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a1dee10fd75d..cfb3145f4602 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -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 @@ -69,17 +69,17 @@ class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScStyleFamilyObj* GetObjectByType_Impl(UINT16 Type) const; - ScStyleFamilyObj* GetObjectByIndex_Impl(UINT32 nIndex) const; - ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; + ScStyleFamilyObj* GetObjectByType_Impl(UINT16 Type) const; + ScStyleFamilyObj* GetObjectByIndex_Impl(UINT32 nIndex) const; + ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; public: ScStyleFamiliesObj(ScDocShell* pDocSh); - virtual ~ScStyleFamiliesObj(); + virtual ~ScStyleFamiliesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -104,7 +104,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XStyleLoader - virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, + virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, @@ -130,32 +130,32 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Familie + ScDocShell* pDocShell; + SfxStyleFamily eFamily; // Familie - ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); - ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); + ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); + ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); - virtual ~ScStyleFamilyObj(); + virtual ~ScStyleFamilyObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -222,13 +222,13 @@ class ScStyleObj : public ::cppu::WeakImplHelper7< { private: const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Familie - String aStyleName; + ScDocShell* pDocShell; + SfxStyleFamily eFamily; // Familie + String aStyleName; - SfxStyleSheetBase* GetStyle_Impl(); + SfxStyleSheetBase* GetStyle_Impl(); const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); - void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, + void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -237,14 +237,14 @@ private: ScStyleObj(); // disabled public: ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName); - virtual ~ScStyleObj(); + virtual ~ScStyleObj(); // per getImplementation gerufen: - sal_Bool IsInserted() const { return pDocShell != NULL; } - SfxStyleFamily GetFamily() const { return eFamily; } - void InitDoc( ScDocShell* pNewDocSh, const String& rNewName ); + sal_Bool IsInserted() const { return pDocShell != NULL; } + SfxStyleFamily GetFamily() const { return eFamily; } + void InitDoc( ScDocShell* pNewDocSh, const String& rNewName ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > CreateEmptyNumberingRules(); @@ -252,21 +252,21 @@ public: // XStyle virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) + virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -278,25 +278,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -304,7 +304,7 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, @@ -332,7 +332,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -343,8 +343,8 @@ public: // XMultiPropertyStates // getPropertyStates already defined for XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 4349c2759ae9..21b26f65d9aa 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -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 @@ -40,12 +40,12 @@ public: }; -struct ScFunctionData // zum Berechnen von einzelnen Funktionen +struct ScFunctionData // zum Berechnen von einzelnen Funktionen { - ScSubTotalFunc eFunc; - double nVal; - long nCount; - BOOL bError; + ScSubTotalFunc eFunc; + double nVal; + long nCount; + BOOL bError; ScFunctionData( ScSubTotalFunc eFn ) : eFunc(eFn), nVal(0.0), nCount(0), bError(FALSE) {} diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 63cefe22626a..a40dfaff3286 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -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 @@ -94,38 +94,38 @@ private: typedef ::std::vector< ScAddress2D > ScAddress2DVec; typedef ::std::auto_ptr< ScAddress2DVec > ScAddress2DVecPtr; - // Daten pro Tabelle ------------------ - ScColumn aCol[MAXCOLCOUNT]; + // Daten pro Tabelle ------------------ + ScColumn aCol[MAXCOLCOUNT]; - String aName; - String aCodeName; - String aComment; - BOOL bScenario; - BOOL bLayoutRTL; + String aName; + String aCodeName; + String aComment; + BOOL bScenario; + BOOL bLayoutRTL; BOOL bLoadingRTL; - String aLinkDoc; - String aLinkFlt; - String aLinkOpt; - String aLinkTab; - ULONG nLinkRefreshDelay; - BYTE nLinkMode; + String aLinkDoc; + String aLinkFlt; + String aLinkOpt; + String aLinkTab; + ULONG nLinkRefreshDelay; + BYTE nLinkMode; // Seitenformatvorlage - String aPageStyle; - BOOL bPageSizeValid; - Size aPageSizeTwips; // Groesse der Druck-Seite - SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten - SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt - SCROW nRepeatStartY; - SCROW nRepeatEndY; + String aPageStyle; + BOOL bPageSizeValid; + Size aPageSizeTwips; // Groesse der Druck-Seite + SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten + SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt + SCROW nRepeatStartY; + SCROW nRepeatEndY; ::std::auto_ptr pTabProtection; - USHORT* pColWidth; + USHORT* pColWidth; ::boost::shared_ptr mpRowHeights; - BYTE* pColFlags; + BYTE* pColFlags; ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags; ::boost::shared_ptr mpHiddenCols; ::boost::shared_ptr mpHiddenRows; @@ -137,52 +137,52 @@ private: ::std::set maColPageBreaks; ::std::set maColManualBreaks; - ScOutlineTable* pOutlineTable; + ScOutlineTable* pOutlineTable; ScSheetEvents* pSheetEvents; - SCCOL nTableAreaX; - SCROW nTableAreaY; - BOOL bTableAreaValid; + SCCOL nTableAreaX; + SCROW nTableAreaY; + BOOL bTableAreaValid; - // interne Verwaltung ------------------ - BOOL bVisible; + // interne Verwaltung ------------------ + BOOL bVisible; BOOL bStreamValid; BOOL bPendingRowHeights; BOOL bCalcNotification; - SCTAB nTab; - USHORT nRecalcLvl; // Rekursionslevel Size-Recalc - ScDocument* pDocument; - utl::SearchParam* pSearchParam; - utl::TextSearch* pSearchText; + SCTAB nTab; + USHORT nRecalcLvl; // Rekursionslevel Size-Recalc + ScDocument* pDocument; + utl::SearchParam* pSearchParam; + utl::TextSearch* pSearchText; mutable String aUpperName; // #i62977# filled only on demand, reset in SetName ScAddress2DVecPtr mxUninitNotes; // SortierParameter um den Stackbedarf von Quicksort zu Minimieren - ScSortParam aSortParam; - CollatorWrapper* pSortCollator; - BOOL bGlobalKeepQuery; - BOOL bSharedNameInserted; + ScSortParam aSortParam; + CollatorWrapper* pSortCollator; + BOOL bGlobalKeepQuery; + BOOL bSharedNameInserted; ScRangeVec aPrintRanges; BOOL bPrintEntireSheet; - ScRange* pRepeatColRange; - ScRange* pRepeatRowRange; + ScRange* pRepeatColRange; + ScRange* pRepeatRowRange; - USHORT nLockCount; + USHORT nLockCount; - ScRangeList* pScenarioRanges; - Color aScenarioColor; + ScRangeList* pScenarioRanges; + Color aScenarioColor; Color aTabBgColor; - USHORT nScenarioFlags; - BOOL bActiveScenario; + USHORT nScenarioFlags; + BOOL bActiveScenario; bool mbPageBreaksValid; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator; friend class ScDBQueryDataIterator; @@ -199,27 +199,27 @@ public: BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE ); ~ScTable(); - ScOutlineTable* GetOutlineTable() { return pOutlineTable; } + ScOutlineTable* GetOutlineTable() { return pOutlineTable; } SCSIZE GetCellCount(SCCOL nCol) const; - ULONG GetCellCount() const; - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln + ULONG GetCellCount() const; + ULONG GetWeightedCount() const; + ULONG GetCodeCount() const; // RPN-Code in Formeln - BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); - void StartOutlineTable(); + BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); + void StartOutlineTable(); - void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL TestRemoveSubTotals( const ScSubTotalParam& rParam ); - void RemoveSubTotals( ScSubTotalParam& rParam ); - BOOL DoSubTotals( ScSubTotalParam& rParam ); + BOOL TestRemoveSubTotals( const ScSubTotalParam& rParam ); + void RemoveSubTotals( ScSubTotalParam& rParam ); + BOOL DoSubTotals( ScSubTotalParam& rParam ); const ScSheetEvents* GetSheetEvents() const { return pSheetEvents; } void SetSheetEvents( const ScSheetEvents* pNew ); - BOOL IsVisible() const { return bVisible; } - void SetVisible( BOOL bVis ); + BOOL IsVisible() const { return bVisible; } + void SetVisible( BOOL bVis ); BOOL IsStreamValid() const { return bStreamValid; } void SetStreamValid( BOOL bSet, BOOL bIgnoreLock = FALSE ); @@ -235,104 +235,104 @@ public: void SetLayoutRTL( BOOL bSet ); void SetLoadingRTL( BOOL bSet ); - BOOL IsScenario() const { return bScenario; } - void SetScenario( BOOL bFlag ); - void GetScenarioComment( String& rComment) const { rComment = aComment; } - void SetScenarioComment( const String& rComment ) { aComment = rComment; } - const Color& GetScenarioColor() const { return aScenarioColor; } - void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } + BOOL IsScenario() const { return bScenario; } + void SetScenario( BOOL bFlag ); + void GetScenarioComment( String& rComment) const { rComment = aComment; } + void SetScenarioComment( const String& rComment ) { aComment = rComment; } + const Color& GetScenarioColor() const { return aScenarioColor; } + void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } const Color& GetTabBgColor() const; void SetTabBgColor(const Color& rColor); - USHORT GetScenarioFlags() const { return nScenarioFlags; } - void SetScenarioFlags(USHORT nNew) { nScenarioFlags = nNew; } - void SetActiveScenario(BOOL bSet) { bActiveScenario = bSet; } - BOOL IsActiveScenario() const { return bActiveScenario; } - - BYTE GetLinkMode() const { return nLinkMode; } - BOOL IsLinked() const { return nLinkMode != SC_LINK_NONE; } - const String& GetLinkDoc() const { return aLinkDoc; } - const String& GetLinkFlt() const { return aLinkFlt; } - const String& GetLinkOpt() const { return aLinkOpt; } - const String& GetLinkTab() const { return aLinkTab; } - ULONG GetLinkRefreshDelay() const { return nLinkRefreshDelay; } - - void SetLink( BYTE nMode, const String& rDoc, const String& rFlt, + USHORT GetScenarioFlags() const { return nScenarioFlags; } + void SetScenarioFlags(USHORT nNew) { nScenarioFlags = nNew; } + void SetActiveScenario(BOOL bSet) { bActiveScenario = bSet; } + BOOL IsActiveScenario() const { return bActiveScenario; } + + BYTE GetLinkMode() const { return nLinkMode; } + BOOL IsLinked() const { return nLinkMode != SC_LINK_NONE; } + const String& GetLinkDoc() const { return aLinkDoc; } + const String& GetLinkFlt() const { return aLinkFlt; } + const String& GetLinkOpt() const { return aLinkOpt; } + const String& GetLinkTab() const { return aLinkTab; } + ULONG GetLinkRefreshDelay() const { return nLinkRefreshDelay; } + + void SetLink( BYTE nMode, const String& rDoc, const String& rFlt, const String& rOpt, const String& rTab, ULONG nRefreshDelay ); - void GetName( String& rName ) const; - void SetName( const String& rNewName ); + void GetName( String& rName ) const; + void SetName( const String& rNewName ); - void GetCodeName( String& rName ) const { rName = aCodeName; } - void SetCodeName( const String& rNewName ) { aCodeName = rNewName; } + void GetCodeName( String& rName ) const { rName = aCodeName; } + void SetCodeName( const String& rNewName ) { aCodeName = rNewName; } const String& GetUpperName() const; - const String& GetPageStyle() const { return aPageStyle; } - void SetPageStyle( const String& rName ); - void PageStyleModified( const String& rNewName ); + const String& GetPageStyle() const { return aPageStyle; } + void SetPageStyle( const String& rName ); + void PageStyleModified( const String& rNewName ); BOOL IsProtected() const; void SetProtection(const ScTableProtection* pProtect); ScTableProtection* GetProtection(); - Size GetPageSize() const; - void SetPageSize( const Size& rSize ); - void SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); + Size GetPageSize() const; + void SetPageSize( const Size& rSize ); + void SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); - void RemoveAutoSpellObj(); + void RemoveAutoSpellObj(); - void LockTable(); - void UnlockTable(); + void LockTable(); + void UnlockTable(); - BOOL IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, + BOOL IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, + BOOL IsSelectionEditable( const ScMarkData& rMark, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - BOOL HasSelectionMatrixFragment( const ScMarkData& rMark ) const; + BOOL HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; + BOOL HasSelectionMatrixFragment( const ScMarkData& rMark ) const; - BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; + BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; - void PutCell( const ScAddress&, ScBaseCell* pCell ); -//UNUSED2009-05 void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); - void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); - void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); - // TRUE = Zahlformat gesetzt - BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + void PutCell( const ScAddress&, ScBaseCell* pCell ); +//UNUSED2009-05 void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); + void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); + void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); + // TRUE = Zahlformat gesetzt + BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); - void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, USHORT nError); + void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); + void SetError( SCCOL nCol, SCROW nRow, USHORT nError); - void GetString( SCCOL nCol, SCROW nRow, String& rString ); - void GetInputString( SCCOL nCol, SCROW nRow, String& rString ); - double GetValue( const ScAddress& rPos ) const + void GetString( SCCOL nCol, SCROW nRow, String& rString ); + void GetInputString( SCCOL nCol, SCROW nRow, String& rString ); + double GetValue( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetValue( rPos.Row() ) : 0.0; } - double GetValue( SCCOL nCol, SCROW nRow ); - void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula, + double GetValue( SCCOL nCol, SCROW nRow ); + void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula, BOOL bAsciiExport = FALSE ); - CellType GetCellType( const ScAddress& rPos ) const + CellType GetCellType( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? - aCol[rPos.Col()].GetCellType( rPos.Row() ) : + return ValidColRow(rPos.Col(),rPos.Row()) ? + aCol[rPos.Col()].GetCellType( rPos.Row() ) : CELLTYPE_NONE; } - CellType GetCellType( SCCOL nCol, SCROW nRow ) const; - ScBaseCell* GetCell( const ScAddress& rPos ) const + CellType GetCellType( SCCOL nCol, SCROW nRow ) const; + ScBaseCell* GetCell( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetCell( rPos.Row() ) : NULL; } - ScBaseCell* GetCell( SCCOL nCol, SCROW nRow ) const; + ScBaseCell* GetCell( SCCOL nCol, SCROW nRow ) const; void GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const; - void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; + void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; /** Returns the pointer to a cell note object at the passed cell address. */ ScPostIt* GetNote( SCCOL nCol, SCROW nRow ); @@ -346,240 +346,240 @@ public: @param bForced True = always create all captions, false = skip when Undo is disabled. */ void InitializeNoteCaptions( bool bForced = false ); - BOOL TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); - void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, + BOOL TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); + void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, BOOL* pUndoOutline = NULL ); - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); - void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); - void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); + void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); + void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, BOOL* pUndoOutline = NULL ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag); - void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag); + void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); - void CopyToClip(const ScRangeList& rRanges, ScTable* pTable, + void CopyToClip(const ScRangeList& rRanges, ScTable* pTable, bool bKeepScenarioFlags, bool bCloneNoteCaptions); - void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, + void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable); - void StartListeningInArea( SCCOL nCol1, SCROW nRow1, + void StartListeningInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void BroadcastInArea( SCCOL nCol1, SCROW nRow1, + void BroadcastInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL, BOOL bAsLink = FALSE, BOOL bColRowFlags = TRUE); - void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL); - void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTransClip, USHORT nFlags, BOOL bAsLink ); - // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, + // Markierung von diesem Dokument + void MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); - void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); - void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab ); - void CopyScenarioFrom( const ScTable* pSrcTab ); - void CopyScenarioTo( ScTable* pDestTab ) const; - BOOL TestCopyScenarioTo( const ScTable* pDestTab ) const; - void MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const; - BOOL HasScenarioRange( const ScRange& rRange ) const; - void InvalidateScenarioRanges(); + void CopyScenarioFrom( const ScTable* pSrcTab ); + void CopyScenarioTo( ScTable* pDestTab ) const; + BOOL TestCopyScenarioTo( const ScTable* pDestTab ) const; + void MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const; + BOOL HasScenarioRange( const ScRange& rRange ) const; + void InvalidateScenarioRanges(); const ScRangeList* GetScenarioRanges() const; - void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; + void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; void InvalidateTableArea(); void InvalidatePageBreaks(); - BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer - BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; - BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; - BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, + BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer + BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; + BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; + BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, SCCOL& rEndCol, BOOL bNotes ) const; - BOOL GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, + BOOL GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, SCROW& rEndRow, BOOL bNotes ) const; - BOOL GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; + BOOL GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; - void ExtendPrintArea( OutputDevice* pDev, + void ExtendPrintArea( OutputDevice* pDev, SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ); void GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const; - bool ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; + bool ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; - SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, + SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScDirection eDir ); - void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY ); - void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, + void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY ); + void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); - void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); + void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - BOOL HasData( SCCOL nCol, SCROW nRow ); - BOOL HasStringData( SCCOL nCol, SCROW nRow ); - BOOL HasValueData( SCCOL nCol, SCROW nRow ); -//UNUSED2008-05 USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; - BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, + BOOL HasData( SCCOL nCol, SCROW nRow ); + BOOL HasStringData( SCCOL nCol, SCROW nRow ); + BOOL HasValueData( SCCOL nCol, SCROW nRow ); +//UNUSED2008-05 USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; + BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - USHORT GetErrCode( const ScAddress& rPos ) const + USHORT GetErrCode( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetErrCode( rPos.Row() ) : 0; } -//UNUSED2008-05 USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; +//UNUSED2008-05 USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; - void ResetChanged( const ScRange& rRange ); + void ResetChanged( const ScRange& rRange ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetDirtyAfterLoad(); - void SetDirtyVar(); - void SetTableOpDirty( const ScRange& ); - void CalcAll(); - void CalcAfterLoad(); - void CompileAll(); - void CompileXML( ScProgress& rProgress ); + void SetDirty(); + void SetDirty( const ScRange& ); + void SetDirtyAfterLoad(); + void SetDirtyVar(); + void SetTableOpDirty( const ScRange& ); + void CalcAll(); + void CalcAfterLoad(); + void CompileAll(); + void CompileXML( ScProgress& rProgress ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true ); - void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos = true ); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void UpdateInsertTab(SCTAB nTable); + void UpdateInsertTab(SCTAB nTable); //UNUSED2008-05 void UpdateInsertTabOnlyCells(SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void SetTabNo(SCTAB nNewTab); + BOOL IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nIndex) const; void FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, std::set& rIndexes) const; - void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScRangeData::IndexMap& rMap ); - void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, double nStepValue, double nMaxValue); - String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); + String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - void UpdateSelectionFunction( ScFunctionData& rData, + void UpdateSelectionFunction( ScFunctionData& rData, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); - void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, USHORT nFormatNo ); - void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); - void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw - BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, + void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); + void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw + BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); + void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); - void GetBorderLines( SCCOL nCol, SCROW nRow, + void GetBorderLines( SCCOL nCol, SCROW nRow, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; -//UNUSED2009-05 BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; +//UNUSED2009-05 BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, + BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; + BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bRefresh, BOOL bAttrs ); - const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const; - const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const; + const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const; + const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( const ScAddress& rPos ) const + ULONG GetNumberFormat( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) : 0; } - ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, + ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, + void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); - void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr ); - void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) + void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); + void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr ); + void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) { if (ValidColRow(rPos.Col(),rPos.Row())) aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); } - void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); - void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, + void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); + void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); - void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); - void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); + void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); + void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, + const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; + const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); + void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - const ScRange* GetRepeatColRange() const { return pRepeatColRange; } - const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; } - void SetRepeatColRange( const ScRange* pNew ); - void SetRepeatRowRange( const ScRange* pNew ); + const ScRange* GetRepeatColRange() const { return pRepeatColRange; } + const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; } + void SetRepeatColRange( const ScRange* pNew ); + void SetRepeatRowRange( const ScRange* pNew ); USHORT GetPrintRangeCount() const { return static_cast< USHORT >( aPrintRanges.size() ); } - const ScRange* GetPrintRange(USHORT nPos) const; + const ScRange* GetPrintRange(USHORT nPos) const; /** Returns true, if the sheet is always printed. */ BOOL IsPrintEntireSheet() const { return bPrintEntireSheet; } @@ -592,76 +592,76 @@ public: /** Marks the specified sheet to be printed completely. Deletes old print ranges! */ void SetPrintEntireSheet(); - void FillPrintSaver( ScPrintSaverTab& rSaveTab ) const; - void RestorePrintRanges( const ScPrintSaverTab& rSaveTab ); + void FillPrintSaver( ScPrintSaverTab& rSaveTab ) const; + void RestorePrintRanges( const ScPrintSaverTab& rSaveTab ); - USHORT GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, + USHORT GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, const ScMarkData* pMarkData, BOOL bSimpleTextImport ); - BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra, + BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bForce, ScProgress* pOuterProgress = NULL, ULONG nProgressStart = 0 ); - long GetNeededSize( SCCOL nCol, SCROW nRow, + long GetNeededSize( SCCOL nCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, BOOL bTotalSize ); - void SetColWidth( SCCOL nCol, USHORT nNewWidth ); - void SetRowHeight( SCROW nRow, USHORT nNewHeight ); - BOOL SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight, + void SetColWidth( SCCOL nCol, USHORT nNewWidth ); + void SetRowHeight( SCROW nRow, USHORT nNewHeight ); + BOOL SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight, double nPPTX, double nPPTY ); - /** - * Set specified row height to specified ranges. Don't check for drawing - * objects etc. Just set the row height. Nothing else. - * - * Note that setting a new row height via this function will not - * invalidate page breaks. + /** + * Set specified row height to specified ranges. Don't check for drawing + * objects etc. Just set the row height. Nothing else. + * + * Note that setting a new row height via this function will not + * invalidate page breaks. */ void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight ); // nPPT fuer Test auf Veraenderung - void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); + void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); - USHORT GetColWidth( SCCOL nCol ) const; + USHORT GetColWidth( SCCOL nCol ) const; SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const; - ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; - ULONG GetColOffset( SCCOL nCol ) const; - ULONG GetRowOffset( SCROW nRow ) const; + ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; + ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; + ULONG GetColOffset( SCCOL nCol ) const; + ULONG GetRowOffset( SCROW nRow ) const; - /** - * Get the last row such that the height of row 0 to the end row is as + /** + * Get the last row such that the height of row 0 to the end row is as * high as possible without exceeding the specified height value. * * @param nHeight maximum desired height - * + * * @return SCROW last row of the range within specified height. */ SCROW GetRowForHeight(ULONG nHeight) const; - USHORT GetOriginalWidth( SCCOL nCol ) const; - USHORT GetOriginalHeight( SCROW nRow ) const; + USHORT GetOriginalWidth( SCCOL nCol ) const; + USHORT GetOriginalHeight( SCROW nRow ) const; - USHORT GetCommonWidth( SCCOL nEndCol ); + USHORT GetCommonWidth( SCCOL nEndCol ); - SCROW GetHiddenRowCount( SCROW nRow ); + SCROW GetHiddenRowCount( SCROW nRow ); - void ShowCol(SCCOL nCol, bool bShow); - void ShowRow(SCROW nRow, bool bShow); - void DBShowRow(SCROW nRow, bool bShow); + void ShowCol(SCCOL nCol, bool bShow); + void ShowRow(SCROW nRow, bool bShow); + void DBShowRow(SCROW nRow, bool bShow); - void ShowRows(SCROW nRow1, SCROW nRow2, bool bShow); - void DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow); + void ShowRows(SCROW nRow1, SCROW nRow2, bool bShow); + void DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow); - void SetColFlags( SCCOL nCol, BYTE nNewFlags ); - void SetRowFlags( SCROW nRow, BYTE nNewFlags ); - void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); + void SetColFlags( SCCOL nCol, BYTE nNewFlags ); + void SetRowFlags( SCROW nRow, BYTE nNewFlags ); + void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); /// @return the index of the last row with any set flags (auto-pagebreak is ignored). SCROW GetLastFlaggedRow() const; @@ -671,18 +671,18 @@ public: /// @return the index of the last changed row (flags and row height, auto pagebreak is ignored). SCROW GetLastChangedRow() const; - BYTE GetColFlags( SCCOL nCol ) const; - BYTE GetRowFlags( SCROW nRow ) const; + BYTE GetColFlags( SCCOL nCol ) const; + BYTE GetRowFlags( SCROW nRow ) const; const ScBitMaskCompressedArray< SCROW, BYTE> * GetRowFlagsArray() const { return pRowFlags; } - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ); + BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ); + BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ); - void UpdatePageBreaks( const ScRange* pUserArea ); - void RemoveManualBreaks(); - BOOL HasManualBreaks() const; + void UpdatePageBreaks( const ScRange* pUserArea ); + void RemoveManualBreaks(); + BOOL HasManualBreaks() const; void SetRowManualBreaks( const ::std::set& rBreaks ); void SetColManualBreaks( const ::std::set& rBreaks ); @@ -693,14 +693,14 @@ public: bool HasRowManualBreak(SCROW nRow) const; bool HasColManualBreak(SCCOL nCol) const; - /** - * Get the row position of the next manual break that occurs at or below - * specified row. When no more manual breaks are present at or below - * the specified row, -1 is returned. - * - * @param nRow row at which the search begins. - * - * @return SCROW next row position with manual page break, or -1 if no + /** + * Get the row position of the next manual break that occurs at or below + * specified row. When no more manual breaks are present at or below + * the specified row, -1 is returned. + * + * @param nRow row at which the search begins. + * + * @return SCROW next row position with manual page break, or -1 if no * more manual breaks are present. */ SCROW GetNextManualBreak(SCROW nRow) const; @@ -743,126 +743,126 @@ public: void SyncColRowFlags(); - void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); + void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); BOOL ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL, BOOL* pbTestEqualCondition = NULL ); - void TopTenQuery( ScQueryParam& ); - SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); - BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + void TopTenQuery( ScQueryParam& ); + SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); + BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates); void GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); - BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); + void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); - sal_Int32 GetMaxStringLen( SCCOL nCol, + sal_Int32 GetMaxStringLen( SCCOL nCol, SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); + void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); - void IncRecalcLevel() { ++nRecalcLvl; } - void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); } + void IncRecalcLevel() { ++nRecalcLvl; } + void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); } - BOOL IsSortCollatorGlobal() const; - void InitSortCollator( const ScSortParam& rPar ); - void DestroySortCollator(); + BOOL IsSortCollatorGlobal() const; + void InitSortCollator( const ScSortParam& rPar ); + void DestroySortCollator(); private: - void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, double nStepValue, double nMaxValue, USHORT nMinDigits, BOOL bAttribs, ScProgress& rProgress ); - void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, FillCmd& rCmd, FillDateCmd& rDateCmd, double& rInc, USHORT& rMinDigits, ScUserListData*& rListData, USHORT& rListIndex); - void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, ScProgress& rProgress ); - BOOL ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, + BOOL ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, BOOL bMarked, BOOL bUnprotected ); - void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, USHORT nFormatNo); - void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData); - void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData); - BOOL SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, + void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData); + void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData); + BOOL SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark); - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, BOOL bIsUndo); - BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); - BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); + BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, ScDocument* pUndoDoc); // benutzen globalen SortParam: - BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); - void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); - void SwapCol(SCCOL nCol1, SCCOL nCol2); - void SwapRow(SCROW nRow1, SCROW nRow2); - short CompareCell( USHORT nSort, + BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); + void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); + void SwapCol(SCCOL nCol1, SCCOL nCol2); + void SwapRow(SCROW nRow1, SCROW nRow2); + short CompareCell( USHORT nSort, ScBaseCell* pCell1, SCCOL nCell1Col, SCROW nCell1Row, ScBaseCell* pCell2, SCCOL nCell2Col, SCROW nCell2Row ); - short Compare(SCCOLROW nIndex1, SCCOLROW nIndex2); - short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2); - ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ); - void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); - void SortReorder( ScSortInfoArray*, ScProgress& ); + short Compare(SCCOLROW nIndex1, SCCOLROW nIndex2); + short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2); + ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ); + void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); + void SortReorder( ScSortInfoArray*, ScProgress& ); - BOOL CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - BOOL CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr); + BOOL CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + BOOL CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr); - BOOL RefVisible(ScFormulaCell* pCell); + BOOL RefVisible(ScFormulaCell* pCell); - BOOL IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); + BOOL IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); - void IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd); - void FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell, + void IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd); + void FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell, SCCOL nDestCol, SCROW nDestRow, BOOL bLast ); - void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, + void UpdateInsertTabAbs(SCTAB nNewPos); + BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, const ScMarkData& rMark) const; - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); + BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); void SetDrawPageSize( bool bResetStreamValid = true, bool bUpdateNoteCaptionPos = true ); - BOOL TestTabRefAbs(SCTAB nTable); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); - - void StartListening( const ScAddress& rAddress, SvtListener* pListener ); - void EndListening( const ScAddress& rAddress, SvtListener* pListener ); - void StartAllListeners(); + BOOL TestTabRefAbs(SCTAB nTable); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); + + void StartListening( const ScAddress& rAddress, SvtListener* pListener ); + void EndListening( const ScAddress& rAddress, SvtListener* pListener ); + void StartAllListeners(); void StartNeededListeners(); // only for cells where NeedsListening()==TRUE - void SetRelNameDirty(); + void SetRelNameDirty(); void SetLoadingMedium(bool bLoading); - SCSIZE FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, + SCSIZE FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY, const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ); @@ -871,13 +871,13 @@ private: void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, BOOL bNumFormatChanged, BOOL bBroadcast ); - /** - * In case the cell text goes beyond the column width, move the max column + /** + * In case the cell text goes beyond the column width, move the max column * position to the right. This is called from ExtendPrintArea. */ void MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY); - /** + /** * Use this to iterate through non-empty visible cells in a single column. */ class VisibleDataCellIterator @@ -888,26 +888,26 @@ private: explicit VisibleDataCellIterator(ScFlatBoolRowSegments& rRowSegs, ScColumn& rColumn); ~VisibleDataCellIterator(); - /** + /** * Set the start row position. In case there is not visible data cell - * at the specified row position, it will move to the position of the - * first visible data cell below that point. - * + * at the specified row position, it will move to the position of the + * first visible data cell below that point. + * * @return First visible data cell if found, or NULL otherwise. - */ + */ ScBaseCell* reset(SCROW nRow); - /** - * Find the next visible data cell position. - * + /** + * Find the next visible data cell position. + * * @return Next visible data cell if found, or NULL otherwise. */ ScBaseCell* next(); - /** + /** * Get the current row position. - * - * @return Current row position, or ROW_NOT_FOUND if the iterator + * + * @return Current row position, or ROW_NOT_FOUND if the iterator * doesn't point to a valid data cell position. */ SCROW getRow() const; diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 72b4de611c2e..10762d551ba5 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -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 @@ -33,10 +33,10 @@ #include #include -//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvEmbeddedObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvEmbeddedObject) +//REMOVE #endif class ScDocShell; struct TableLink_Impl; @@ -66,17 +66,17 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh(const String& rNewFile, const String& rNewFilter, + BOOL Refresh(const String& rNewFile, const String& rNewFilter, const String* pNewOptions /* = NULL */, ULONG nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetAddUndo(BOOL bSet) { bAddUndo = bSet; } - void SetPaint(BOOL bSet) { bDoPaint = bSet; } + void SetInCreate(BOOL bSet) { bInCreate = bSet; } + void SetAddUndo(BOOL bSet) { bAddUndo = bSet; } + void SetPaint(BOOL bSet) { bDoPaint = bSet; } - const String& GetFileName() const { return aFileName; } - const String& GetFilterName() const { return aFilterName; } - const String& GetOptions() const { return aOptions; } + const String& GetFileName() const { return aFileName; } + const String& GetFilterName() const { return aFilterName; } + const String& GetOptions() const { return aOptions; } - BOOL IsUsed() const; + BOOL IsUsed() const; DECL_LINK( RefreshHdl, ScTableLink* ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); @@ -88,34 +88,34 @@ class SfxMedium; class SC_DLLPUBLIC ScDocumentLoader { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; SfxObjectShellRef aRef; - SfxMedium* pMedium; + SfxMedium* pMedium; public: ScDocumentLoader( const String& rFileName, String& rFilterName, String& rOptions, UINT32 nRekCnt = 0, BOOL bWithInteraction = FALSE ); ~ScDocumentLoader(); - ScDocument* GetDocument(); - ScDocShell* GetDocShell() { return pDocShell; } - BOOL IsError() const; - String GetTitle() const; + ScDocument* GetDocument(); + ScDocShell* GetDocShell() { return pDocShell; } + BOOL IsError() const; + String GetTitle() const; - void ReleaseDocRef(); // without calling DoClose + void ReleaseDocRef(); // without calling DoClose - static String GetOptions( SfxMedium& rMedium ); + static String GetOptions( SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent true = Tries to detect the filter by looking at the file contents. false = Detects filter by file name extension only (should be used in filter code only). @return TRUE if a filter could be found, FALSE otherwise. */ - static BOOL GetFilterName( const String& rFileName, + static BOOL GetFilterName( const String& rFileName, String& rFilter, String& rOptions, BOOL bWithContent, BOOL bWithInteraction ); - static void RemoveAppPrefix( String& rFilterName ); + static void RemoveAppPrefix( String& rFilterName ); }; #endif diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx index 7baa461061fd..6126abce11f1 100644 --- a/sc/inc/tabopparams.hxx +++ b/sc/inc/tabopparams.hxx @@ -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/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index d8dbd45d27fa..99294a613855 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -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 @@ -75,7 +75,7 @@ public: virtual bool hasPasswordHash(ScPasswordHash eHash) const = 0; virtual void setPassword(const String& aPassText) = 0; virtual ::com::sun::star::uno::Sequence getPasswordHash(ScPasswordHash eHash) const = 0; - virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, + virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, ScPasswordHash eHash = PASSHASH_OOO) = 0; virtual bool verifyPassword(const String& aPassText) const = 0; }; @@ -100,15 +100,15 @@ public: virtual bool isProtected() const; virtual bool isProtectedWithPass() const; virtual void setProtected(bool bProtected); - + virtual bool isPasswordEmpty() const; virtual bool hasPasswordHash(ScPasswordHash eHash) const; virtual void setPassword(const String& aPassText); virtual ::com::sun::star::uno::Sequence getPasswordHash(ScPasswordHash eHash) const; - virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, + virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, ScPasswordHash eHash = PASSHASH_OOO); virtual bool verifyPassword(const String& aPassText) const; - + bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); @@ -119,7 +119,7 @@ private: // ============================================================================ /** sheet protection state container - + This class stores sheet's protection state: 1) whether the protection is on, 2) password and/or password hash, and 3) any associated protection options. This class is also used as a protection state @@ -157,15 +157,15 @@ public: virtual bool isProtected() const; virtual bool isProtectedWithPass() const; virtual void setProtected(bool bProtected); - + virtual bool isPasswordEmpty() const; virtual bool hasPasswordHash(ScPasswordHash eHash) const; virtual void setPassword(const String& aPassText); virtual ::com::sun::star::uno::Sequence getPasswordHash(ScPasswordHash eHash) const; - virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, + virtual void setPasswordHash(const ::com::sun::star::uno::Sequence& aPassword, ScPasswordHash eHash = PASSHASH_OOO); virtual bool verifyPassword(const String& aPassText) const; - + bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 857f4c0c25e2..ef4461aad252 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -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 @@ -63,16 +63,16 @@ class ScDocShell; -#define SC_LINKTARGETTYPE_SHEET 0 -#define SC_LINKTARGETTYPE_RANGENAME 1 -#define SC_LINKTARGETTYPE_DBAREA 2 +#define SC_LINKTARGETTYPE_SHEET 0 +#define SC_LINKTARGETTYPE_RANGENAME 1 +#define SC_LINKTARGETTYPE_DBAREA 2 -#define SC_LINKTARGETTYPE_COUNT 3 +#define SC_LINKTARGETTYPE_COUNT 3 -#define SCLINKTARGET_SERVICE "com.sun.star.document.LinkTarget" +#define SCLINKTARGET_SERVICE "com.sun.star.document.LinkTarget" -//! Graphic / OleObject (need separate collections!) +//! Graphic / OleObject (need separate collections!) class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< @@ -81,31 +81,31 @@ class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - String aNames[SC_LINKTARGETTYPE_COUNT]; + ScDocShell* pDocShell; + String aNames[SC_LINKTARGETTYPE_COUNT]; public: ScLinkTargetTypesObj(ScDocShell* pDocSh); - virtual ~ScLinkTargetTypesObj(); + virtual ~ScLinkTargetTypesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) - throw( ::com::sun::star::container::NoSuchElementException, + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -116,49 +116,49 @@ class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - sal_uInt16 nType; - String aName; + ScDocShell* pDocShell; + sal_uInt16 nType; + String aName; public: ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT); - virtual ~ScLinkTargetTypeObj(); + virtual ~ScLinkTargetTypeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); + static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -166,8 +166,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -177,28 +177,28 @@ class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xCollection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xCollection; public: ScLinkTargetsObj( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & rColl ); - virtual ~ScLinkTargetsObj(); + virtual ~ScLinkTargetsObj(); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) - throw( ::com::sun::star::container::NoSuchElementException, + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index e8ff73bf7d85..d7a701e00f92 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -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 @@ -28,7 +28,7 @@ #ifndef SC_TEXTSUNO_HXX #define SC_TEXTSUNO_HXX -#include "global.hxx" // ScRange, ScAddress +#include "global.hxx" // ScRange, ScAddress #include "address.hxx" #include #include @@ -55,13 +55,13 @@ class ScFieldEditEngine; struct ScHeaderFieldData; -#define SC_HDFT_LEFT 0 -#define SC_HDFT_CENTER 1 -#define SC_HDFT_RIGHT 2 +#define SC_HDFT_LEFT 0 +#define SC_HDFT_CENTER 1 +#define SC_HDFT_RIGHT 2 -// ScHeaderFooterContentObj ist ein dummer Container, der per setPropertyValue -// wieder in die Seitenvorlage geschrieben werden muss +// ScHeaderFooterContentObj ist ein dummer Container, der per setPropertyValue +// wieder in die Seitenvorlage geschrieben werden muss class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< com::sun::star::sheet::XHeaderFooterContent, @@ -69,10 +69,10 @@ class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - EditTextObject* pLeftText; - EditTextObject* pCenterText; - EditTextObject* pRightText; - SfxBroadcaster aBC; + EditTextObject* pLeftText; + EditTextObject* pCenterText; + EditTextObject* pRightText; + SfxBroadcaster aBC; ScHeaderFooterContentObj(); // disabled @@ -80,17 +80,17 @@ public: ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ); - virtual ~ScHeaderFooterContentObj(); + virtual ~ScHeaderFooterContentObj(); // fuer ScPageHFItem (per getImplementation) - const EditTextObject* GetLeftEditObject() const { return pLeftText; } - const EditTextObject* GetCenterEditObject() const { return pCenterText; } - const EditTextObject* GetRightEditObject() const { return pRightText; } + const EditTextObject* GetLeftEditObject() const { return pLeftText; } + const EditTextObject* GetCenterEditObject() const { return pCenterText; } + const EditTextObject* GetRightEditObject() const { return pRightText; } - void AddListener( SfxListener& rListener ); - void RemoveListener( SfxListener& rListener ); + void AddListener( SfxListener& rListener ); + void RemoveListener( SfxListener& rListener ); - void UpdateText( USHORT nPart, EditEngine& rSource ); + void UpdateText( USHORT nPart, EditEngine& rSource ); // XHeaderFooterContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL @@ -119,35 +119,35 @@ public: }; -// ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj +// ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj class ScHeaderFooterTextData : public SfxListener { private: - ScHeaderFooterContentObj& rContentObj; - USHORT nPart; - ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; - BOOL bInUpdate; + ScHeaderFooterContentObj& rContentObj; + USHORT nPart; + ScEditEngineDefaulter* pEditEngine; + SvxEditEngineForwarder* pForwarder; + BOOL bDataValid; + BOOL bInUpdate; public: ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, USHORT nP ); ~ScHeaderFooterTextData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // helper functions - SvxTextForwarder* GetTextForwarder(); - void UpdateData(); - ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } + SvxTextForwarder* GetTextForwarder(); + void UpdateData(); + ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } - USHORT GetPart() const { return nPart; } - ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } + USHORT GetPart() const { return nPart; } + ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } }; -// ScHeaderFooterTextObj veraendert den Text in einem ScHeaderFooterContentObj +// ScHeaderFooterTextObj veraendert den Text in einem ScHeaderFooterContentObj class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< com::sun::star::text::XText, @@ -157,29 +157,29 @@ class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScHeaderFooterTextData aTextData; - SvxUnoText* pUnoText; + ScHeaderFooterTextData aTextData; + SvxUnoText* pUnoText; - void CreateUnoText_Impl(); + void CreateUnoText_Impl(); public: ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, USHORT nP ); - virtual ~ScHeaderFooterTextObj(); + virtual ~ScHeaderFooterTextObj(); - const SvxUnoText& GetUnoText(); + const SvxUnoText& GetUnoText(); - static void FillDummyFieldData( ScHeaderFieldData& rData ); + static void FillDummyFieldData( ScHeaderFieldData& rData ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -191,11 +191,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -209,11 +209,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTextRangeMover - virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException); @@ -243,13 +243,13 @@ public: }; -// derived cursor objects for getImplementation and getText/getStart/getEnd +// derived cursor objects for getImplementation and getText/getStart/getEnd -//! uno3: SvxUnoTextCursor is not derived from XUnoTunnel, but should be (?) +//! uno3: SvxUnoTextCursor is not derived from XUnoTunnel, but should be (?) class ScCellTextCursor : public SvxUnoTextCursor { - ScCellObj& rTextObj; + ScCellObj& rTextObj; public: ScCellTextCursor(const ScCellTextCursor& rOther); @@ -279,7 +279,7 @@ public: class ScHeaderFooterTextCursor : public SvxUnoTextCursor { private: - ScHeaderFooterTextObj& rTextObj; + ScHeaderFooterTextObj& rTextObj; public: ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther); @@ -338,21 +338,21 @@ public: // ScAnnotationTextCursor isn't needed anymore - SvxUnoTextCursor is used instead -// ScEditEngineTextObj for formatted cell content that is not inserted in a cell or header/footer -// (used for XML export of change tracking contents) +// ScEditEngineTextObj for formatted cell content that is not inserted in a cell or header/footer +// (used for XML export of change tracking contents) class ScSimpleEditSourceHelper { - ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - ScSimpleEditSource* pOriginalSource; + ScEditEngineDefaulter* pEditEngine; + SvxEditEngineForwarder* pForwarder; + ScSimpleEditSource* pOriginalSource; public: ScSimpleEditSourceHelper(); ~ScSimpleEditSourceHelper(); - ScSimpleEditSource* GetOriginalSource() const { return pOriginalSource; } - ScEditEngineDefaulter* GetEditEngine() const { return pEditEngine; } + ScSimpleEditSource* GetOriginalSource() const { return pOriginalSource; } + ScEditEngineDefaulter* GetEditEngine() const { return pEditEngine; } }; class ScEditEngineTextObj : public ScSimpleEditSourceHelper, public SvxUnoText @@ -361,49 +361,49 @@ public: ScEditEngineTextObj(); virtual ~ScEditEngineTextObj() throw(); - void SetText( const EditTextObject& rTextObject ); - EditTextObject* CreateTextObject(); + void SetText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); }; -// ScCellTextData: shared data between sub objects of a cell text object +// ScCellTextData: shared data between sub objects of a cell text object class ScCellTextData : public SfxListener { protected: - ScDocShell* pDocShell; - ScAddress aCellPos; - ScFieldEditEngine* pEditEngine; - SvxEditEngineForwarder* pForwarder; - ScSharedCellEditSource* pOriginalSource; - BOOL bDataValid; - BOOL bInUpdate; - BOOL bDirty; - BOOL bDoUpdate; + ScDocShell* pDocShell; + ScAddress aCellPos; + ScFieldEditEngine* pEditEngine; + SvxEditEngineForwarder* pForwarder; + ScSharedCellEditSource* pOriginalSource; + BOOL bDataValid; + BOOL bInUpdate; + BOOL bDirty; + BOOL bDoUpdate; protected: virtual void GetCellText(const ScAddress& rCellPos, String& rText); public: ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellTextData(); + virtual ~ScCellTextData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // helper functions for ScSharedCellEditSource: virtual SvxTextForwarder* GetTextForwarder(); - void UpdateData(); - ScFieldEditEngine* GetEditEngine() { GetTextForwarder(); return pEditEngine; } + void UpdateData(); + ScFieldEditEngine* GetEditEngine() { GetTextForwarder(); return pEditEngine; } - ScSharedCellEditSource* GetOriginalSource(); // used as argument for SvxUnoText ctor + ScSharedCellEditSource* GetOriginalSource(); // used as argument for SvxUnoText ctor // used for ScCellEditSource: - ScDocShell* GetDocShell() const { return pDocShell; } - const ScAddress& GetCellPos() const { return aCellPos; } + ScDocShell* GetDocShell() const { return pDocShell; } + const ScAddress& GetCellPos() const { return aCellPos; } - void SetDirty(BOOL bValue) { bDirty = bValue; } - BOOL IsDirty() const { return bDirty; } - void SetDoUpdate(BOOL bValue) { bDoUpdate = bValue; } + void SetDirty(BOOL bValue) { bDirty = bValue; } + BOOL IsDirty() const { return bDirty; } + void SetDoUpdate(BOOL bValue) { bDoUpdate = bValue; } }; class ScCellTextObj : public ScCellTextData, public SvxUnoText diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index e4659921e7be..8bb6ca02bfdf 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -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 @@ -48,13 +48,13 @@ class ScToken; typedef ::std::vector< ScComplexRefData > ScRefList; typedef formula::SimpleIntrusiveReference< class ScToken > ScTokenRef; -/** - * Another ref-counted token type using shared_ptr. Be extra careful - * not to mix use of this smart pointer type with ScTokenRef, since - * mixing them might cause a premature object deletion because the same - * object may be ref-counted by two different smart pointer wrappers. - * - * You have been warned. +/** + * Another ref-counted token type using shared_ptr. Be extra careful + * not to mix use of this smart pointer type with ScTokenRef, since + * mixing them might cause a premature object deletion because the same + * object may be ref-counted by two different smart pointer wrappers. + * + * You have been warned. */ typedef ::boost::shared_ptr< ScToken > ScSharedTokenRef; @@ -475,7 +475,7 @@ public: pD = &aDub; } ~SingleDoubleRefModifier() - { + { if ( pS ) *pS = (*pD).Ref1; } diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 5ded8f4410d3..da6031e04079 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -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 @@ -59,7 +59,7 @@ public: /** Determines the extent of direct adjacent references. Only use with real functions, e.g. GetOuterFuncOpCode() == ocSum ! */ - BOOL GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, + BOOL GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, const ScAddress& rPos, ScDirection ); formula::FormulaToken* AddRawToken( const ScRawToken& ); diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index c727063281e6..6bb1611c7a2b 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -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/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index e21140699e4c..26f7150b7157 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -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 @@ -33,22 +33,22 @@ class ScUnitConverterData : public StrData { - double fValue; + double fValue; // not implemented - ScUnitConverterData& operator=( const ScUnitConverterData& ); + ScUnitConverterData& operator=( const ScUnitConverterData& ); public: ScUnitConverterData( const String& rFromUnit, const String& rToUnit, double fValue = 1.0 ); ScUnitConverterData( const ScUnitConverterData& ); - virtual ~ScUnitConverterData() {}; + virtual ~ScUnitConverterData() {}; - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - double GetValue() const { return fValue; } + double GetValue() const { return fValue; } - static void BuildIndexString( String& rStr, + static void BuildIndexString( String& rStr, const String& rFromUnit, const String& rToUnit ); }; @@ -58,13 +58,13 @@ class ScUnitConverter : public ScStrCollection { // not implemented ScUnitConverter( const ScUnitConverter& ); - ScUnitConverter& operator=( const ScUnitConverter& ); + ScUnitConverter& operator=( const ScUnitConverter& ); public: ScUnitConverter( USHORT nInit = 16, USHORT nDelta = 4 ); - virtual ~ScUnitConverter() {}; + virtual ~ScUnitConverter() {}; - BOOL GetValue( double& fValue, const String& rFromUnit, + BOOL GetValue( double& fValue, const String& rFromUnit, const String& rToUnit ) const; }; diff --git a/sc/inc/unoguard.hxx b/sc/inc/unoguard.hxx index 0768eada24d7..4c83f3cb2de0 100644 --- a/sc/inc/unoguard.hxx +++ b/sc/inc/unoguard.hxx @@ -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/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 2d011f425398..e76072b84b97 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -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 @@ -41,128 +41,128 @@ #define SC_SERVICENAME_CHDATAPROV "com.sun.star.chart2.data.DataProvider" #define SC_SERVICENAME_CHRANGEHILIGHT "com.sun.star.chart2.data.RangeHighlightListener" -// document -#define SC_UNO_AREALINKS "AreaLinks" -#define SC_UNO_DDELINKS "DDELinks" +// document +#define SC_UNO_AREALINKS "AreaLinks" +#define SC_UNO_DDELINKS "DDELinks" #define SC_UNO_EXTERNALDOCLINKS "ExternalDocLinks" -#define SC_UNO_COLLABELRNG "ColumnLabelRanges" -#define SC_UNO_DATABASERNG "DatabaseRanges" -#define SC_UNO_NAMEDRANGES "NamedRanges" -#define SC_UNO_ROWLABELRNG "RowLabelRanges" -#define SC_UNO_SHEETLINKS "SheetLinks" -#define SC_UNO_FORBIDDEN "ForbiddenCharacters" -#define SC_UNO_HASDRAWPAGES "HasDrawPages" - -// CharacterProperties -#define SC_UNONAME_CCOLOR "CharColor" -#define SC_UNONAME_CHEIGHT "CharHeight" -#define SC_UNONAME_CUNDER "CharUnderline" -#define SC_UNONAME_CUNDLCOL "CharUnderlineColor" -#define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor" -#define SC_UNONAME_COVER "CharOverline" -#define SC_UNONAME_COVRLCOL "CharOverlineColor" -#define SC_UNONAME_COVRLHAS "CharOverlineHasColor" -#define SC_UNONAME_CWEIGHT "CharWeight" -#define SC_UNONAME_CPOST "CharPosture" -#define SC_UNONAME_CCROSS "CharCrossedOut" -#define SC_UNONAME_CSTRIKE "CharStrikeout" -#define SC_UNONAME_CLOCAL "CharLocale" -#define SC_UNONAME_CSHADD "CharShadowed" -#define SC_UNONAME_CFONT "CharFont" -#define SC_UNONAME_COUTL "CharContoured" -#define SC_UNONAME_CEMPHAS "CharEmphasis" -#define SC_UNONAME_CFNAME "CharFontName" -#define SC_UNONAME_CFSTYLE "CharFontStyleName" -#define SC_UNONAME_CFFAMIL "CharFontFamily" -#define SC_UNONAME_CFCHARS "CharFontCharSet" -#define SC_UNONAME_CFPITCH "CharFontPitch" -#define SC_UNONAME_CRELIEF "CharRelief" -#define SC_UNONAME_CWORDMOD "CharWordMode" - -#define SC_UNO_CJK_CFNAME "CharFontNameAsian" -#define SC_UNO_CJK_CFSTYLE "CharFontStyleNameAsian" -#define SC_UNO_CJK_CFFAMIL "CharFontFamilyAsian" -#define SC_UNO_CJK_CFCHARS "CharFontCharSetAsian" -#define SC_UNO_CJK_CFPITCH "CharFontPitchAsian" -#define SC_UNO_CJK_CHEIGHT "CharHeightAsian" -#define SC_UNO_CJK_CWEIGHT "CharWeightAsian" -#define SC_UNO_CJK_CPOST "CharPostureAsian" -#define SC_UNO_CJK_CLOCAL "CharLocaleAsian" - -#define SC_UNO_CTL_CFNAME "CharFontNameComplex" -#define SC_UNO_CTL_CFSTYLE "CharFontStyleNameComplex" -#define SC_UNO_CTL_CFFAMIL "CharFontFamilyComplex" -#define SC_UNO_CTL_CFCHARS "CharFontCharSetComplex" -#define SC_UNO_CTL_CFPITCH "CharFontPitchComplex" -#define SC_UNO_CTL_CHEIGHT "CharHeightComplex" -#define SC_UNO_CTL_CWEIGHT "CharWeightComplex" -#define SC_UNO_CTL_CPOST "CharPostureComplex" -#define SC_UNO_CTL_CLOCAL "CharLocaleComplex" - -// CellProperties -#define SC_UNONAME_CELLSTYL "CellStyle" -#define SC_UNONAME_CELLBACK "CellBackColor" -#define SC_UNONAME_CELLTRAN "IsCellBackgroundTransparent" -#define SC_UNONAME_CELLPRO "CellProtection" -#define SC_UNONAME_CELLHJUS "HoriJustify" -#define SC_UNONAME_CELLVJUS "VertJustify" -#define SC_UNONAME_CELLORI "Orientation" -#define SC_UNONAME_NUMFMT "NumberFormat" -#define SC_UNONAME_SHADOW "ShadowFormat" -#define SC_UNONAME_TBLBORD "TableBorder" -#define SC_UNONAME_WRAP "IsTextWrapped" -#define SC_UNONAME_PINDENT "ParaIndent" -#define SC_UNONAME_PTMARGIN "ParaTopMargin" -#define SC_UNONAME_PBMARGIN "ParaBottomMargin" -#define SC_UNONAME_PLMARGIN "ParaLeftMargin" -#define SC_UNONAME_PRMARGIN "ParaRightMargin" -#define SC_UNONAME_ROTANG "RotateAngle" -#define SC_UNONAME_ROTREF "RotateReference" -#define SC_UNONAME_ASIANVERT "AsianVerticalMode" -#define SC_UNONAME_WRITING "WritingMode" - -#define SC_UNONAME_BOTTBORDER "BottomBorder" -#define SC_UNONAME_LEFTBORDER "LeftBorder" -#define SC_UNONAME_RIGHTBORDER "RightBorder" -#define SC_UNONAME_TOPBORDER "TopBorder" +#define SC_UNO_COLLABELRNG "ColumnLabelRanges" +#define SC_UNO_DATABASERNG "DatabaseRanges" +#define SC_UNO_NAMEDRANGES "NamedRanges" +#define SC_UNO_ROWLABELRNG "RowLabelRanges" +#define SC_UNO_SHEETLINKS "SheetLinks" +#define SC_UNO_FORBIDDEN "ForbiddenCharacters" +#define SC_UNO_HASDRAWPAGES "HasDrawPages" + +// CharacterProperties +#define SC_UNONAME_CCOLOR "CharColor" +#define SC_UNONAME_CHEIGHT "CharHeight" +#define SC_UNONAME_CUNDER "CharUnderline" +#define SC_UNONAME_CUNDLCOL "CharUnderlineColor" +#define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor" +#define SC_UNONAME_COVER "CharOverline" +#define SC_UNONAME_COVRLCOL "CharOverlineColor" +#define SC_UNONAME_COVRLHAS "CharOverlineHasColor" +#define SC_UNONAME_CWEIGHT "CharWeight" +#define SC_UNONAME_CPOST "CharPosture" +#define SC_UNONAME_CCROSS "CharCrossedOut" +#define SC_UNONAME_CSTRIKE "CharStrikeout" +#define SC_UNONAME_CLOCAL "CharLocale" +#define SC_UNONAME_CSHADD "CharShadowed" +#define SC_UNONAME_CFONT "CharFont" +#define SC_UNONAME_COUTL "CharContoured" +#define SC_UNONAME_CEMPHAS "CharEmphasis" +#define SC_UNONAME_CFNAME "CharFontName" +#define SC_UNONAME_CFSTYLE "CharFontStyleName" +#define SC_UNONAME_CFFAMIL "CharFontFamily" +#define SC_UNONAME_CFCHARS "CharFontCharSet" +#define SC_UNONAME_CFPITCH "CharFontPitch" +#define SC_UNONAME_CRELIEF "CharRelief" +#define SC_UNONAME_CWORDMOD "CharWordMode" + +#define SC_UNO_CJK_CFNAME "CharFontNameAsian" +#define SC_UNO_CJK_CFSTYLE "CharFontStyleNameAsian" +#define SC_UNO_CJK_CFFAMIL "CharFontFamilyAsian" +#define SC_UNO_CJK_CFCHARS "CharFontCharSetAsian" +#define SC_UNO_CJK_CFPITCH "CharFontPitchAsian" +#define SC_UNO_CJK_CHEIGHT "CharHeightAsian" +#define SC_UNO_CJK_CWEIGHT "CharWeightAsian" +#define SC_UNO_CJK_CPOST "CharPostureAsian" +#define SC_UNO_CJK_CLOCAL "CharLocaleAsian" + +#define SC_UNO_CTL_CFNAME "CharFontNameComplex" +#define SC_UNO_CTL_CFSTYLE "CharFontStyleNameComplex" +#define SC_UNO_CTL_CFFAMIL "CharFontFamilyComplex" +#define SC_UNO_CTL_CFCHARS "CharFontCharSetComplex" +#define SC_UNO_CTL_CFPITCH "CharFontPitchComplex" +#define SC_UNO_CTL_CHEIGHT "CharHeightComplex" +#define SC_UNO_CTL_CWEIGHT "CharWeightComplex" +#define SC_UNO_CTL_CPOST "CharPostureComplex" +#define SC_UNO_CTL_CLOCAL "CharLocaleComplex" + +// CellProperties +#define SC_UNONAME_CELLSTYL "CellStyle" +#define SC_UNONAME_CELLBACK "CellBackColor" +#define SC_UNONAME_CELLTRAN "IsCellBackgroundTransparent" +#define SC_UNONAME_CELLPRO "CellProtection" +#define SC_UNONAME_CELLHJUS "HoriJustify" +#define SC_UNONAME_CELLVJUS "VertJustify" +#define SC_UNONAME_CELLORI "Orientation" +#define SC_UNONAME_NUMFMT "NumberFormat" +#define SC_UNONAME_SHADOW "ShadowFormat" +#define SC_UNONAME_TBLBORD "TableBorder" +#define SC_UNONAME_WRAP "IsTextWrapped" +#define SC_UNONAME_PINDENT "ParaIndent" +#define SC_UNONAME_PTMARGIN "ParaTopMargin" +#define SC_UNONAME_PBMARGIN "ParaBottomMargin" +#define SC_UNONAME_PLMARGIN "ParaLeftMargin" +#define SC_UNONAME_PRMARGIN "ParaRightMargin" +#define SC_UNONAME_ROTANG "RotateAngle" +#define SC_UNONAME_ROTREF "RotateReference" +#define SC_UNONAME_ASIANVERT "AsianVerticalMode" +#define SC_UNONAME_WRITING "WritingMode" + +#define SC_UNONAME_BOTTBORDER "BottomBorder" +#define SC_UNONAME_LEFTBORDER "LeftBorder" +#define SC_UNONAME_RIGHTBORDER "RightBorder" +#define SC_UNONAME_TOPBORDER "TopBorder" #define SC_UNONAME_DIAGONAL_TLBR "DiagonalTLBR" #define SC_UNONAME_DIAGONAL_BLTR "DiagonalBLTR" #define SC_UNONAME_SHRINK_TO_FIT "ShrinkToFit" -#define SC_UNONAME_PISHANG "ParaIsHangingPunctuation" -#define SC_UNONAME_PISCHDIST "ParaIsCharacterDistance" -#define SC_UNONAME_PISFORBID "ParaIsForbiddenRules" -#define SC_UNONAME_PISHYPHEN "ParaIsHyphenation" -#define SC_UNONAME_PADJUST "ParaAdjust" -#define SC_UNONAME_PLASTADJ "ParaLastLineAdjust" +#define SC_UNONAME_PISHANG "ParaIsHangingPunctuation" +#define SC_UNONAME_PISCHDIST "ParaIsCharacterDistance" +#define SC_UNONAME_PISFORBID "ParaIsForbiddenRules" +#define SC_UNONAME_PISHYPHEN "ParaIsHyphenation" +#define SC_UNONAME_PADJUST "ParaAdjust" +#define SC_UNONAME_PLASTADJ "ParaLastLineAdjust" -#define SC_UNONAME_NUMRULES "NumberingRules" +#define SC_UNONAME_NUMRULES "NumberingRules" -// Styles -#define SC_UNONAME_DISPNAME "DisplayName" +// Styles +#define SC_UNONAME_DISPNAME "DisplayName" -// XStyleLoader -#define SC_UNONAME_OVERWSTL "OverwriteStyles" -#define SC_UNONAME_LOADCELL "LoadCellStyles" -#define SC_UNONAME_LOADPAGE "LoadPageStyles" +// XStyleLoader +#define SC_UNONAME_OVERWSTL "OverwriteStyles" +#define SC_UNONAME_LOADCELL "LoadCellStyles" +#define SC_UNONAME_LOADPAGE "LoadPageStyles" -// SheetCellRange -#define SC_UNONAME_POS "Position" -#define SC_UNONAME_SIZE "Size" +// SheetCellRange +#define SC_UNONAME_POS "Position" +#define SC_UNONAME_SIZE "Size" #define SC_UNONAME_ABSNAME "AbsoluteName" -// column/row/sheet -#define SC_UNONAME_CELLHGT "Height" -#define SC_UNONAME_CELLWID "Width" -#define SC_UNONAME_CELLVIS "IsVisible" -#define SC_UNONAME_CELLFILT "IsFiltered" -#define SC_UNONAME_MANPAGE "IsManualPageBreak" -#define SC_UNONAME_NEWPAGE "IsStartOfNewPage" -#define SC_UNONAME_OHEIGHT "OptimalHeight" -#define SC_UNONAME_OWIDTH "OptimalWidth" -#define SC_UNONAME_PAGESTL "PageStyle" +// column/row/sheet +#define SC_UNONAME_CELLHGT "Height" +#define SC_UNONAME_CELLWID "Width" +#define SC_UNONAME_CELLVIS "IsVisible" +#define SC_UNONAME_CELLFILT "IsFiltered" +#define SC_UNONAME_MANPAGE "IsManualPageBreak" +#define SC_UNONAME_NEWPAGE "IsStartOfNewPage" +#define SC_UNONAME_OHEIGHT "OptimalHeight" +#define SC_UNONAME_OWIDTH "OptimalWidth" +#define SC_UNONAME_PAGESTL "PageStyle" #define SC_UNONAME_ISACTIVE "IsActive" #define SC_UNONAME_BORDCOL "BorderColor" #define SC_UNONAME_PROTECT "Protected" @@ -175,68 +175,68 @@ #define SC_UNONAME_AUTOPRINT "AutomaticPrintArea" #define SC_UNONAME_TABCOLOR "TabColor" -// LinkTarget -#define SC_UNO_LINKDISPBIT "LinkDisplayBitmap" -#define SC_UNO_LINKDISPNAME "LinkDisplayName" +// LinkTarget +#define SC_UNO_LINKDISPBIT "LinkDisplayBitmap" +#define SC_UNO_LINKDISPNAME "LinkDisplayName" -// drawing objects -#define SC_UNONAME_IMAGEMAP "ImageMap" +// drawing objects +#define SC_UNONAME_IMAGEMAP "ImageMap" #define SC_UNONAME_ANCHOR "Anchor" #define SC_UNONAME_HORIPOS "HoriOrientPosition" #define SC_UNONAME_VERTPOS "VertOrientPosition" -// other cell properties -#define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel" -#define SC_UNONAME_CHROWHDR "ChartRowAsLabel" -#define SC_UNONAME_CONDFMT "ConditionalFormat" -#define SC_UNONAME_CONDLOC "ConditionalFormatLocal" -#define SC_UNONAME_CONDXML "ConditionalFormatXML" -#define SC_UNONAME_VALIDAT "Validation" -#define SC_UNONAME_VALILOC "ValidationLocal" -#define SC_UNONAME_VALIXML "ValidationXML" -#define SC_UNONAME_FORMLOC "FormulaLocal" -#define SC_UNONAME_FORMRT "FormulaResultType" - -#define SC_UNONAME_USERDEF "UserDefinedAttributes" -#define SC_UNONAME_TEXTUSER "TextUserDefinedAttributes" - -// auto format -#define SC_UNONAME_INCBACK "IncludeBackground" -#define SC_UNONAME_INCBORD "IncludeBorder" -#define SC_UNONAME_INCFONT "IncludeFont" -#define SC_UNONAME_INCJUST "IncludeJustify" -#define SC_UNONAME_INCNUM "IncludeNumberFormat" -#define SC_UNONAME_INCWIDTH "IncludeWidthAndHeight" - -// function description -#define SC_UNONAME_ARGUMENTS "Arguments" -#define SC_UNONAME_CATEGORY "Category" -#define SC_UNONAME_DESCRIPTION "Description" -#define SC_UNONAME_ID "Id" -#define SC_UNONAME_NAME "Name" - -// application settings -#define SC_UNONAME_DOAUTOCP "DoAutoComplete" -#define SC_UNONAME_ENTERED "EnterEdit" -#define SC_UNONAME_EXPREF "ExpandReferences" -#define SC_UNONAME_EXTFMT "ExtendFormat" -#define SC_UNONAME_LINKUPD "LinkUpdateMode" -#define SC_UNONAME_MARKHDR "MarkHeader" -#define SC_UNONAME_METRIC "Metric" -#define SC_UNONAME_MOVEDIR "MoveDirection" -#define SC_UNONAME_MOVESEL "MoveSelection" -#define SC_UNONAME_RANGEFIN "RangeFinder" -#define SC_UNONAME_SCALE "Scale" -#define SC_UNONAME_STBFUNC "StatusBarFunction" -#define SC_UNONAME_ULISTS "UserLists" -#define SC_UNONAME_USETABCOL "UseTabCol" -#define SC_UNONAME_PRMETRICS "UsePrinterMetrics" -#define SC_UNONAME_PRALLSH "PrintAllSheets" -#define SC_UNONAME_PREMPTY "PrintEmptyPages" +// other cell properties +#define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel" +#define SC_UNONAME_CHROWHDR "ChartRowAsLabel" +#define SC_UNONAME_CONDFMT "ConditionalFormat" +#define SC_UNONAME_CONDLOC "ConditionalFormatLocal" +#define SC_UNONAME_CONDXML "ConditionalFormatXML" +#define SC_UNONAME_VALIDAT "Validation" +#define SC_UNONAME_VALILOC "ValidationLocal" +#define SC_UNONAME_VALIXML "ValidationXML" +#define SC_UNONAME_FORMLOC "FormulaLocal" +#define SC_UNONAME_FORMRT "FormulaResultType" + +#define SC_UNONAME_USERDEF "UserDefinedAttributes" +#define SC_UNONAME_TEXTUSER "TextUserDefinedAttributes" + +// auto format +#define SC_UNONAME_INCBACK "IncludeBackground" +#define SC_UNONAME_INCBORD "IncludeBorder" +#define SC_UNONAME_INCFONT "IncludeFont" +#define SC_UNONAME_INCJUST "IncludeJustify" +#define SC_UNONAME_INCNUM "IncludeNumberFormat" +#define SC_UNONAME_INCWIDTH "IncludeWidthAndHeight" + +// function description +#define SC_UNONAME_ARGUMENTS "Arguments" +#define SC_UNONAME_CATEGORY "Category" +#define SC_UNONAME_DESCRIPTION "Description" +#define SC_UNONAME_ID "Id" +#define SC_UNONAME_NAME "Name" + +// application settings +#define SC_UNONAME_DOAUTOCP "DoAutoComplete" +#define SC_UNONAME_ENTERED "EnterEdit" +#define SC_UNONAME_EXPREF "ExpandReferences" +#define SC_UNONAME_EXTFMT "ExtendFormat" +#define SC_UNONAME_LINKUPD "LinkUpdateMode" +#define SC_UNONAME_MARKHDR "MarkHeader" +#define SC_UNONAME_METRIC "Metric" +#define SC_UNONAME_MOVEDIR "MoveDirection" +#define SC_UNONAME_MOVESEL "MoveSelection" +#define SC_UNONAME_RANGEFIN "RangeFinder" +#define SC_UNONAME_SCALE "Scale" +#define SC_UNONAME_STBFUNC "StatusBarFunction" +#define SC_UNONAME_ULISTS "UserLists" +#define SC_UNONAME_USETABCOL "UseTabCol" +#define SC_UNONAME_PRMETRICS "UsePrinterMetrics" +#define SC_UNONAME_PRALLSH "PrintAllSheets" +#define SC_UNONAME_PREMPTY "PrintEmptyPages" #define SC_UNONAME_REPLWARN "ReplaceCellsWarning" -// data pilot field -#define SC_UNONAME_FUNCTION "Function" +// data pilot field +#define SC_UNONAME_FUNCTION "Function" #define SC_UNONAME_SUBTOTALS "Subtotals" #define SC_UNONAME_SELPAGE "SelectedPage" #define SC_UNONAME_USESELPAGE "UseSelectedPage" @@ -252,44 +252,44 @@ #define SC_UNONAME_GROUPINFO "GroupInfo" #define SC_UNONAME_SHOWEMPTY "ShowEmpty" -// data pilot item +// data pilot item #define SC_UNONAME_SHOWDETAIL "ShowDetail" #define SC_UNONAME_ISHIDDEN "IsHidden" -// database options -#define SC_UNONAME_CASE "CaseSensitive" -#define SC_UNONAME_DBNAME "DatabaseName" -#define SC_UNONAME_FORMATS "IncludeFormats" -#define SC_UNONAME_INSBRK "InsertPageBreaks" -#define SC_UNONAME_KEEPFORM "KeepFormats" -#define SC_UNONAME_MOVCELLS "MoveCells" -#define SC_UNONAME_ISUSER "IsUserDefined" -#define SC_UNONAME_ISNATIVE "IsNative" -#define SC_UNONAME_REGEXP "RegularExpressions" -#define SC_UNONAME_SAVEOUT "SaveOutputPosition" -#define SC_UNONAME_SKIPDUP "SkipDuplicates" -#define SC_UNONAME_SRCOBJ "SourceObject" -#define SC_UNONAME_SRCTYPE "SourceType" -#define SC_UNONAME_STRIPDAT "StripData" -#define SC_UNONAME_UNIQUE "UniqueOnly" -#define SC_UNONAME_USEREGEX "UseRegularExpressions" -#define SC_UNONAME_ULIST "UserListEnabled" -#define SC_UNONAME_UINDEX "UserListIndex" -#define SC_UNONAME_BINDFMT "BindFormatsToContent" -#define SC_UNONAME_COPYOUT "CopyOutputData" -#define SC_UNONAME_ISCASE "IsCaseSensitive" -#define SC_UNONAME_ISULIST "IsUserListEnabled" -#define SC_UNONAME_OUTPOS "OutputPosition" -#define SC_UNONAME_CONTHDR "ContainsHeader" -#define SC_UNONAME_MAXFLD "MaxFieldCount" -#define SC_UNONAME_ORIENT "Orientation" +// database options +#define SC_UNONAME_CASE "CaseSensitive" +#define SC_UNONAME_DBNAME "DatabaseName" +#define SC_UNONAME_FORMATS "IncludeFormats" +#define SC_UNONAME_INSBRK "InsertPageBreaks" +#define SC_UNONAME_KEEPFORM "KeepFormats" +#define SC_UNONAME_MOVCELLS "MoveCells" +#define SC_UNONAME_ISUSER "IsUserDefined" +#define SC_UNONAME_ISNATIVE "IsNative" +#define SC_UNONAME_REGEXP "RegularExpressions" +#define SC_UNONAME_SAVEOUT "SaveOutputPosition" +#define SC_UNONAME_SKIPDUP "SkipDuplicates" +#define SC_UNONAME_SRCOBJ "SourceObject" +#define SC_UNONAME_SRCTYPE "SourceType" +#define SC_UNONAME_STRIPDAT "StripData" +#define SC_UNONAME_UNIQUE "UniqueOnly" +#define SC_UNONAME_USEREGEX "UseRegularExpressions" +#define SC_UNONAME_ULIST "UserListEnabled" +#define SC_UNONAME_UINDEX "UserListIndex" +#define SC_UNONAME_BINDFMT "BindFormatsToContent" +#define SC_UNONAME_COPYOUT "CopyOutputData" +#define SC_UNONAME_ISCASE "IsCaseSensitive" +#define SC_UNONAME_ISULIST "IsUserListEnabled" +#define SC_UNONAME_OUTPOS "OutputPosition" +#define SC_UNONAME_CONTHDR "ContainsHeader" +#define SC_UNONAME_MAXFLD "MaxFieldCount" +#define SC_UNONAME_ORIENT "Orientation" #define SC_UNONAME_ISSORTCOLUMNS "IsSortColumns" -#define SC_UNONAME_SORTFLD "SortFields" -#define SC_UNONAME_SORTASC "SortAscending" -#define SC_UNONAME_ENUSLIST "EnableUserSortList" -#define SC_UNONAME_USINDEX "UserSortListIndex" -#define SC_UNONAME_COLLLOC "CollatorLocale" -#define SC_UNONAME_COLLALG "CollatorAlgorithm" +#define SC_UNONAME_SORTFLD "SortFields" +#define SC_UNONAME_SORTASC "SortAscending" +#define SC_UNONAME_ENUSLIST "EnableUserSortList" +#define SC_UNONAME_USINDEX "UserSortListIndex" +#define SC_UNONAME_COLLLOC "CollatorLocale" +#define SC_UNONAME_COLLALG "CollatorAlgorithm" #define SC_UNONAME_AUTOFLT "AutoFilter" #define SC_UNONAME_FLTCRT "FilterCriteriaSource" #define SC_UNONAME_USEFLTCRT "UseFilterCriteriaSource" @@ -299,169 +299,169 @@ #define SC_UNONAME_TOKENINDEX "TokenIndex" #define SC_UNONAME_ISSHAREDFMLA "IsSharedFormula" -// text fields -#define SC_UNONAME_ANCTYPE "AnchorType" -#define SC_UNONAME_ANCTYPES "AnchorTypes" -#define SC_UNONAME_TEXTWRAP "TextWrap" -#define SC_UNONAME_FILEFORM "FileFormat" - -// url field -#define SC_UNONAME_REPR "Representation" -#define SC_UNONAME_TARGET "TargetFrame" -#define SC_UNONAME_URL "URL" - -// conditional format -#define SC_UNONAME_OPERATOR "Operator" -#define SC_UNONAME_FORMULA1 "Formula1" -#define SC_UNONAME_FORMULA2 "Formula2" -#define SC_UNONAME_SOURCEPOS "SourcePosition" +// text fields +#define SC_UNONAME_ANCTYPE "AnchorType" +#define SC_UNONAME_ANCTYPES "AnchorTypes" +#define SC_UNONAME_TEXTWRAP "TextWrap" +#define SC_UNONAME_FILEFORM "FileFormat" + +// url field +#define SC_UNONAME_REPR "Representation" +#define SC_UNONAME_TARGET "TargetFrame" +#define SC_UNONAME_URL "URL" + +// conditional format +#define SC_UNONAME_OPERATOR "Operator" +#define SC_UNONAME_FORMULA1 "Formula1" +#define SC_UNONAME_FORMULA2 "Formula2" +#define SC_UNONAME_SOURCEPOS "SourcePosition" #define SC_UNONAME_SOURCESTR "SourcePositionAsString" // only for use in XML filter #define SC_UNONAME_FORMULANMSP1 "FormulaNamespace1" // only for use in XML filter #define SC_UNONAME_FORMULANMSP2 "FormulaNamespace2" // only for use in XML filter #define SC_UNONAME_GRAMMAR1 "Grammar1" // only for use in XML filter #define SC_UNONAME_GRAMMAR2 "Grammar2" // only for use in XML filter -#define SC_UNONAME_STYLENAME "StyleName" - -// validation -#define SC_UNONAME_ERRALSTY "ErrorAlertStyle" -#define SC_UNONAME_ERRMESS "ErrorMessage" -#define SC_UNONAME_ERRTITLE "ErrorTitle" -#define SC_UNONAME_IGNOREBL "IgnoreBlankCells" -#define SC_UNONAME_INPMESS "InputMessage" -#define SC_UNONAME_INPTITLE "InputTitle" -#define SC_UNONAME_SHOWERR "ShowErrorMessage" -#define SC_UNONAME_SHOWINP "ShowInputMessage" +#define SC_UNONAME_STYLENAME "StyleName" + +// validation +#define SC_UNONAME_ERRALSTY "ErrorAlertStyle" +#define SC_UNONAME_ERRMESS "ErrorMessage" +#define SC_UNONAME_ERRTITLE "ErrorTitle" +#define SC_UNONAME_IGNOREBL "IgnoreBlankCells" +#define SC_UNONAME_INPMESS "InputMessage" +#define SC_UNONAME_INPTITLE "InputTitle" +#define SC_UNONAME_SHOWERR "ShowErrorMessage" +#define SC_UNONAME_SHOWINP "ShowInputMessage" #define SC_UNONAME_SHOWLIST "ShowList" -#define SC_UNONAME_TYPE "Type" - -// links -#define SC_UNONAME_FILTER "Filter" -#define SC_UNONAME_FILTOPT "FilterOptions" -#define SC_UNONAME_LINKURL "Url" -#define SC_UNONAME_REFPERIOD "RefreshPeriod" -#define SC_UNONAME_REFDELAY "RefreshDelay" // deprecated, don't use anymore - -// search descriptor -#define SC_UNO_SRCHBACK "SearchBackwards" -#define SC_UNO_SRCHBYROW "SearchByRow" -#define SC_UNO_SRCHCASE "SearchCaseSensitive" -#define SC_UNO_SRCHREGEXP "SearchRegularExpression" -#define SC_UNO_SRCHSIM "SearchSimilarity" -#define SC_UNO_SRCHSIMADD "SearchSimilarityAdd" -#define SC_UNO_SRCHSIMEX "SearchSimilarityExchange" -#define SC_UNO_SRCHSIMREL "SearchSimilarityRelax" -#define SC_UNO_SRCHSIMREM "SearchSimilarityRemove" -#define SC_UNO_SRCHSTYLES "SearchStyles" -#define SC_UNO_SRCHTYPE "SearchType" -#define SC_UNO_SRCHWORDS "SearchWords" - -// old (5.2) property names for page styles - for compatibility only! -#define OLD_UNO_PAGE_BACKCOLOR "BackgroundColor" -#define OLD_UNO_PAGE_BACKTRANS "IsBackgroundTransparent" -#define OLD_UNO_PAGE_HDRBACKCOL "HeaderBackgroundColor" -#define OLD_UNO_PAGE_HDRBACKTRAN "TransparentHeaderBackground" -#define OLD_UNO_PAGE_HDRSHARED "HeaderShared" -#define OLD_UNO_PAGE_HDRDYNAMIC "HeaderDynamic" -#define OLD_UNO_PAGE_HDRON "HeaderOn" -#define OLD_UNO_PAGE_FTRBACKCOL "FooterBackgroundColor" -#define OLD_UNO_PAGE_FTRBACKTRAN "TransparentFooterBackground" -#define OLD_UNO_PAGE_FTRSHARED "FooterShared" -#define OLD_UNO_PAGE_FTRDYNAMIC "FooterDynamic" -#define OLD_UNO_PAGE_FTRON "FooterOn" - -// page styles -#define SC_UNO_PAGE_BACKCOLOR "BackColor" -#define SC_UNO_PAGE_BACKTRANS "BackTransparent" -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" -#define SC_UNO_PAGE_GRAPHICLOC "BackGraphicLocation" -#define SC_UNO_PAGE_GRAPHICURL "BackGraphicURL" -#define SC_UNO_PAGE_LEFTBORDER SC_UNONAME_LEFTBORDER -#define SC_UNO_PAGE_RIGHTBORDER SC_UNONAME_RIGHTBORDER -#define SC_UNO_PAGE_BOTTBORDER SC_UNONAME_BOTTBORDER -#define SC_UNO_PAGE_TOPBORDER SC_UNONAME_TOPBORDER -#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" -#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" -#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" -#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" -#define SC_UNO_PAGE_BORDERDIST "BorderDistance" -#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" -#define SC_UNO_PAGE_LEFTMARGIN "LeftMargin" -#define SC_UNO_PAGE_RIGHTMARGIN "RightMargin" -#define SC_UNO_PAGE_TOPMARGIN "TopMargin" -#define SC_UNO_PAGE_BOTTMARGIN "BottomMargin" -#define SC_UNO_PAGE_LANDSCAPE "IsLandscape" -#define SC_UNO_PAGE_NUMBERTYPE "NumberingType" -#define SC_UNO_PAGE_SYTLELAYOUT "PageStyleLayout" -#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" -#define SC_UNO_PAGE_SIZE "Size" -#define SC_UNO_PAGE_WIDTH "Width" -#define SC_UNO_PAGE_HEIGHT "Height" -#define SC_UNO_PAGE_CENTERHOR "CenterHorizontally" -#define SC_UNO_PAGE_CENTERVER "CenterVertically" -#define SC_UNO_PAGE_PRINTANNOT "PrintAnnotations" -#define SC_UNO_PAGE_PRINTGRID "PrintGrid" -#define SC_UNO_PAGE_PRINTHEADER "PrintHeaders" -#define SC_UNO_PAGE_PRINTCHARTS "PrintCharts" -#define SC_UNO_PAGE_PRINTOBJS "PrintObjects" -#define SC_UNO_PAGE_PRINTDRAW "PrintDrawing" -#define SC_UNO_PAGE_PRINTDOWN "PrintDownFirst" -#define SC_UNO_PAGE_SCALEVAL "PageScale" -#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" +#define SC_UNONAME_TYPE "Type" + +// links +#define SC_UNONAME_FILTER "Filter" +#define SC_UNONAME_FILTOPT "FilterOptions" +#define SC_UNONAME_LINKURL "Url" +#define SC_UNONAME_REFPERIOD "RefreshPeriod" +#define SC_UNONAME_REFDELAY "RefreshDelay" // deprecated, don't use anymore + +// search descriptor +#define SC_UNO_SRCHBACK "SearchBackwards" +#define SC_UNO_SRCHBYROW "SearchByRow" +#define SC_UNO_SRCHCASE "SearchCaseSensitive" +#define SC_UNO_SRCHREGEXP "SearchRegularExpression" +#define SC_UNO_SRCHSIM "SearchSimilarity" +#define SC_UNO_SRCHSIMADD "SearchSimilarityAdd" +#define SC_UNO_SRCHSIMEX "SearchSimilarityExchange" +#define SC_UNO_SRCHSIMREL "SearchSimilarityRelax" +#define SC_UNO_SRCHSIMREM "SearchSimilarityRemove" +#define SC_UNO_SRCHSTYLES "SearchStyles" +#define SC_UNO_SRCHTYPE "SearchType" +#define SC_UNO_SRCHWORDS "SearchWords" + +// old (5.2) property names for page styles - for compatibility only! +#define OLD_UNO_PAGE_BACKCOLOR "BackgroundColor" +#define OLD_UNO_PAGE_BACKTRANS "IsBackgroundTransparent" +#define OLD_UNO_PAGE_HDRBACKCOL "HeaderBackgroundColor" +#define OLD_UNO_PAGE_HDRBACKTRAN "TransparentHeaderBackground" +#define OLD_UNO_PAGE_HDRSHARED "HeaderShared" +#define OLD_UNO_PAGE_HDRDYNAMIC "HeaderDynamic" +#define OLD_UNO_PAGE_HDRON "HeaderOn" +#define OLD_UNO_PAGE_FTRBACKCOL "FooterBackgroundColor" +#define OLD_UNO_PAGE_FTRBACKTRAN "TransparentFooterBackground" +#define OLD_UNO_PAGE_FTRSHARED "FooterShared" +#define OLD_UNO_PAGE_FTRDYNAMIC "FooterDynamic" +#define OLD_UNO_PAGE_FTRON "FooterOn" + +// page styles +#define SC_UNO_PAGE_BACKCOLOR "BackColor" +#define SC_UNO_PAGE_BACKTRANS "BackTransparent" +#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" +#define SC_UNO_PAGE_GRAPHICLOC "BackGraphicLocation" +#define SC_UNO_PAGE_GRAPHICURL "BackGraphicURL" +#define SC_UNO_PAGE_LEFTBORDER SC_UNONAME_LEFTBORDER +#define SC_UNO_PAGE_RIGHTBORDER SC_UNONAME_RIGHTBORDER +#define SC_UNO_PAGE_BOTTBORDER SC_UNONAME_BOTTBORDER +#define SC_UNO_PAGE_TOPBORDER SC_UNONAME_TOPBORDER +#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" +#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" +#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" +#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" +#define SC_UNO_PAGE_BORDERDIST "BorderDistance" +#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" +#define SC_UNO_PAGE_LEFTMARGIN "LeftMargin" +#define SC_UNO_PAGE_RIGHTMARGIN "RightMargin" +#define SC_UNO_PAGE_TOPMARGIN "TopMargin" +#define SC_UNO_PAGE_BOTTMARGIN "BottomMargin" +#define SC_UNO_PAGE_LANDSCAPE "IsLandscape" +#define SC_UNO_PAGE_NUMBERTYPE "NumberingType" +#define SC_UNO_PAGE_SYTLELAYOUT "PageStyleLayout" +#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" +#define SC_UNO_PAGE_SIZE "Size" +#define SC_UNO_PAGE_WIDTH "Width" +#define SC_UNO_PAGE_HEIGHT "Height" +#define SC_UNO_PAGE_CENTERHOR "CenterHorizontally" +#define SC_UNO_PAGE_CENTERVER "CenterVertically" +#define SC_UNO_PAGE_PRINTANNOT "PrintAnnotations" +#define SC_UNO_PAGE_PRINTGRID "PrintGrid" +#define SC_UNO_PAGE_PRINTHEADER "PrintHeaders" +#define SC_UNO_PAGE_PRINTCHARTS "PrintCharts" +#define SC_UNO_PAGE_PRINTOBJS "PrintObjects" +#define SC_UNO_PAGE_PRINTDRAW "PrintDrawing" +#define SC_UNO_PAGE_PRINTDOWN "PrintDownFirst" +#define SC_UNO_PAGE_SCALEVAL "PageScale" +#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" -#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" -#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" -#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" -#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" -#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" -#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" -#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" -#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" -#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" -#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" -#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" -#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" -#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" -#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" -#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" -#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" -#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" -#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" -#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" -#define SC_UNO_PAGE_HDRON "HeaderIsOn" -#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" -#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" -#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" -#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" -#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" -#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" -#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" -#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" -#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" -#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" -#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" -#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" -#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" -#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" -#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" -#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" -#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" -#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" -#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" -#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" -#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" -#define SC_UNO_PAGE_FTRON "FooterIsOn" -#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" -#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" - -// document settings +#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" +#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" +#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" +#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" +#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" +#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" +#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" +#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" +#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" +#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" +#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" +#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" +#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" +#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" +#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" +#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" +#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" +#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" +#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" +#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" +#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" +#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" +#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" +#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" +#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" +#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" +#define SC_UNO_PAGE_HDRON "HeaderIsOn" +#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" +#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" +#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" +#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" +#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" +#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" +#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" +#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" +#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" +#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" +#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" +#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" +#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" +#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" +#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" +#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" +#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" +#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" +#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" +#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" +#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" +#define SC_UNO_PAGE_FTRON "FooterIsOn" +#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" +#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" + +// document settings #define SC_UNO_CALCASSHOWN "CalcAsShown" #define SC_UNO_DEFTABSTOP "DefaultTabStop" #define SC_UNO_TABSTOPDIS "TabStopDistance" // is the same like the before, but only the writer name @@ -487,77 +487,77 @@ #define SC_UNO_REFERENCEDEVICE "ReferenceDevice" #define SC_UNO_CODENAME "CodeName" -// document properties from FormModel -#define SC_UNO_APPLYFMDES "ApplyFormDesignMode" -#define SC_UNO_AUTOCONTFOC "AutomaticControlFocus" +// document properties from FormModel +#define SC_UNO_APPLYFMDES "ApplyFormDesignMode" +#define SC_UNO_AUTOCONTFOC "AutomaticControlFocus" -// view options -#define SC_UNO_COLROWHDR "HasColumnRowHeaders" -#define SC_UNO_GRIDCOLOR "GridColor" +// view options +#define SC_UNO_COLROWHDR "HasColumnRowHeaders" +#define SC_UNO_GRIDCOLOR "GridColor" #define SC_UNO_HIDESPELL "HideSpellMarks" /* deprecated #i91949 */ -#define SC_UNO_HORSCROLL "HasHorizontalScrollBar" -#define SC_UNO_OUTLSYMB "IsOutlineSymbolsSet" -#define SC_UNO_SHEETTABS "HasSheetTabs" -#define SC_UNO_SHOWANCHOR "ShowAnchor" -#define SC_UNO_SHOWCHARTS "ShowCharts" -#define SC_UNO_SHOWDRAW "ShowDrawing" -#define SC_UNO_SHOWFORM "ShowFormulas" -#define SC_UNO_SHOWGRID "ShowGrid" -#define SC_UNO_SHOWHELP "ShowHelpLines" -#define SC_UNO_SHOWNOTES "ShowNotes" -#define SC_UNO_SHOWOBJ "ShowObjects" -#define SC_UNO_SHOWPAGEBR "ShowPageBreaks" -#define SC_UNO_SHOWZERO "ShowZeroValues" -#define SC_UNO_SHOWSOLID "SolidHandles" -#define SC_UNO_VALUEHIGH "IsValueHighlightingEnabled" -#define SC_UNO_VERTSCROLL "HasVerticalScrollBar" -#define SC_UNO_SNAPTORASTER "IsSnapToRaster" -#define SC_UNO_RASTERVIS "RasterIsVisible" -#define SC_UNO_RASTERRESX "RasterResolutionX" -#define SC_UNO_RASTERRESY "RasterResolutionY" -#define SC_UNO_RASTERSUBX "RasterSubdivisionX" -#define SC_UNO_RASTERSUBY "RasterSubdivisionY" -#define SC_UNO_RASTERSYNC "IsRasterAxisSynchronized" -#define SC_UNO_AUTOCALC "AutoCalculate" -#define SC_UNO_PRINTERNAME "PrinterName" -#define SC_UNO_PRINTERSETUP "PrinterSetup" -#define SC_UNO_APPLYDOCINF "ApplyUserData" -#define SC_UNO_CHARCOMP "CharacterCompressionType" -#define SC_UNO_ASIANKERN "IsKernAsianPunctuation" -#define SC_UNO_VISAREA "VisibleArea" +#define SC_UNO_HORSCROLL "HasHorizontalScrollBar" +#define SC_UNO_OUTLSYMB "IsOutlineSymbolsSet" +#define SC_UNO_SHEETTABS "HasSheetTabs" +#define SC_UNO_SHOWANCHOR "ShowAnchor" +#define SC_UNO_SHOWCHARTS "ShowCharts" +#define SC_UNO_SHOWDRAW "ShowDrawing" +#define SC_UNO_SHOWFORM "ShowFormulas" +#define SC_UNO_SHOWGRID "ShowGrid" +#define SC_UNO_SHOWHELP "ShowHelpLines" +#define SC_UNO_SHOWNOTES "ShowNotes" +#define SC_UNO_SHOWOBJ "ShowObjects" +#define SC_UNO_SHOWPAGEBR "ShowPageBreaks" +#define SC_UNO_SHOWZERO "ShowZeroValues" +#define SC_UNO_SHOWSOLID "SolidHandles" +#define SC_UNO_VALUEHIGH "IsValueHighlightingEnabled" +#define SC_UNO_VERTSCROLL "HasVerticalScrollBar" +#define SC_UNO_SNAPTORASTER "IsSnapToRaster" +#define SC_UNO_RASTERVIS "RasterIsVisible" +#define SC_UNO_RASTERRESX "RasterResolutionX" +#define SC_UNO_RASTERRESY "RasterResolutionY" +#define SC_UNO_RASTERSUBX "RasterSubdivisionX" +#define SC_UNO_RASTERSUBY "RasterSubdivisionY" +#define SC_UNO_RASTERSYNC "IsRasterAxisSynchronized" +#define SC_UNO_AUTOCALC "AutoCalculate" +#define SC_UNO_PRINTERNAME "PrinterName" +#define SC_UNO_PRINTERSETUP "PrinterSetup" +#define SC_UNO_APPLYDOCINF "ApplyUserData" +#define SC_UNO_CHARCOMP "CharacterCompressionType" +#define SC_UNO_ASIANKERN "IsKernAsianPunctuation" +#define SC_UNO_VISAREA "VisibleArea" #define SC_UNO_ZOOMTYPE "ZoomType" #define SC_UNO_ZOOMVALUE "ZoomValue" #define SC_UNO_UPDTEMPL "UpdateFromTemplate" - + /*Stampit enable/disable print cancel */ #define SC_UNO_ALLOWPRINTJOBCANCEL "AllowPrintJobCancel" -// old (5.2) property names for view options - for compatibility only! -#define OLD_UNO_COLROWHDR "ColumnRowHeaders" -#define OLD_UNO_HORSCROLL "HorizontalScrollBar" -#define OLD_UNO_OUTLSYMB "OutlineSymbols" -#define OLD_UNO_SHEETTABS "SheetTabs" -#define OLD_UNO_VALUEHIGH "ValueHighlighting" -#define OLD_UNO_VERTSCROLL "VerticalScrollBar" - -// data pilot source -#define SC_UNO_COLGRAND "ColumnGrand" -#define SC_UNO_ROWGRAND "RowGrand" -#define SC_UNO_ORIGINAL "Original" -#define SC_UNO_ISDATALA "IsDataLayoutDimension" -#define SC_UNO_ORIENTAT "Orientation" -#define SC_UNO_POSITION "Position" -#define SC_UNO_FUNCTION "Function" -#define SC_UNO_USEDHIER "UsedHierarchy" -#define SC_UNO_FILTER "Filter" -#define SC_UNO_SUBTOTAL "SubTotals" -#define SC_UNO_SHOWEMPT "ShowEmpty" -#define SC_UNO_ISVISIBL "IsVisible" -#define SC_UNO_SHOWDETA "ShowDetails" -#define SC_UNO_IGNOREEM "IgnoreEmptyRows" -#define SC_UNO_REPEATIF "RepeatIfEmpty" -#define SC_UNO_DATADESC "DataDescription" -#define SC_UNO_NUMBERFO "NumberFormat" +// old (5.2) property names for view options - for compatibility only! +#define OLD_UNO_COLROWHDR "ColumnRowHeaders" +#define OLD_UNO_HORSCROLL "HorizontalScrollBar" +#define OLD_UNO_OUTLSYMB "OutlineSymbols" +#define OLD_UNO_SHEETTABS "SheetTabs" +#define OLD_UNO_VALUEHIGH "ValueHighlighting" +#define OLD_UNO_VERTSCROLL "VerticalScrollBar" + +// data pilot source +#define SC_UNO_COLGRAND "ColumnGrand" +#define SC_UNO_ROWGRAND "RowGrand" +#define SC_UNO_ORIGINAL "Original" +#define SC_UNO_ISDATALA "IsDataLayoutDimension" +#define SC_UNO_ORIENTAT "Orientation" +#define SC_UNO_POSITION "Position" +#define SC_UNO_FUNCTION "Function" +#define SC_UNO_USEDHIER "UsedHierarchy" +#define SC_UNO_FILTER "Filter" +#define SC_UNO_SUBTOTAL "SubTotals" +#define SC_UNO_SHOWEMPT "ShowEmpty" +#define SC_UNO_ISVISIBL "IsVisible" +#define SC_UNO_SHOWDETA "ShowDetails" +#define SC_UNO_IGNOREEM "IgnoreEmptyRows" +#define SC_UNO_REPEATIF "RepeatIfEmpty" +#define SC_UNO_DATADESC "DataDescription" +#define SC_UNO_NUMBERFO "NumberFormat" #define SC_UNO_ROWFIELDCOUNT "RowFieldCount" #define SC_UNO_COLUMNFIELDCOUNT "ColumnFieldCount" #define SC_UNO_DATAFIELDCOUNT "DataFieldCount" @@ -567,10 +567,10 @@ #define SC_UNO_HAS_HIDDEN_MEMBER "HasHiddenMember" // (preliminary:) -#define SC_UNO_REFVALUE "ReferenceValue" -#define SC_UNO_SORTING "Sorting" -#define SC_UNO_AUTOSHOW "AutoShow" -#define SC_UNO_LAYOUT "Layout" +#define SC_UNO_REFVALUE "ReferenceValue" +#define SC_UNO_SORTING "Sorting" +#define SC_UNO_AUTOSHOW "AutoShow" +#define SC_UNO_LAYOUT "Layout" // data pilot descriptor #define SC_UNO_IGNEMPROWS "IgnoreEmptyRows" @@ -587,16 +587,16 @@ #define SC_UNO_USERNAME "UserName" #define SC_UNO_PASSWORD "Password" -// range selection -#define SC_UNONAME_INITVAL "InitialValue" -#define SC_UNONAME_TITLE "Title" -#define SC_UNONAME_CLOSEONUP "CloseOnMouseRelease" -#define SC_UNONAME_SINGLECELL "SingleCellMode" +// range selection +#define SC_UNONAME_INITVAL "InitialValue" +#define SC_UNONAME_TITLE "Title" +#define SC_UNONAME_CLOSEONUP "CloseOnMouseRelease" +#define SC_UNONAME_SINGLECELL "SingleCellMode" #define SC_UNONAME_MULTISEL "MultiSelectionMode" -// XRenderable -#define SC_UNONAME_PAGESIZE "PageSize" -#define SC_UNONAME_RENDERDEV "RenderDevice" +// XRenderable +#define SC_UNONAME_PAGESIZE "PageSize" +#define SC_UNONAME_RENDERDEV "RenderDevice" #define SC_UNONAME_SOURCERANGE "SourceRange" #define SC_UNONAME_INC_NP_AREA "PageIncludesNonprintableArea" @@ -612,7 +612,7 @@ #define SC_UNONAME_REFSHEET "ReferenceSheet" // --> PB 2004-08-23 #i33095# Security Options -#define SC_UNO_LOADREADONLY "LoadReadonly" +#define SC_UNO_LOADREADONLY "LoadReadonly" // <-- #define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo" @@ -637,7 +637,7 @@ // EventDescriptor -#define SC_UNO_EVENTTYPE "EventType" +#define SC_UNO_EVENTTYPE "EventType" #define SC_UNO_SCRIPT "Script" #endif diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx index 3947f28cfb12..72cae3b879d1 100644 --- a/sc/inc/unoreflist.hxx +++ b/sc/inc/unoreflist.hxx @@ -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/sc/inc/unowids.hxx b/sc/inc/unowids.hxx index 175022a0ba14..9c890894a310 100644 --- a/sc/inc/unowids.hxx +++ b/sc/inc/unowids.hxx @@ -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,40 +32,40 @@ #include "scitems.hxx" -// WIDs for uno property maps, -// never stored in files +// WIDs for uno property maps, +// never stored in files -#define SC_WID_UNO_START 1200 +#define SC_WID_UNO_START 1200 -#define SC_WID_UNO_CELLSTYL ( SC_WID_UNO_START + 0 ) -#define SC_WID_UNO_CHCOLHDR ( SC_WID_UNO_START + 1 ) -#define SC_WID_UNO_CHROWHDR ( SC_WID_UNO_START + 2 ) -#define SC_WID_UNO_CONDFMT ( SC_WID_UNO_START + 3 ) -#define SC_WID_UNO_CONDLOC ( SC_WID_UNO_START + 4 ) -#define SC_WID_UNO_CONDXML ( SC_WID_UNO_START + 5 ) -#define SC_WID_UNO_TBLBORD ( SC_WID_UNO_START + 6 ) -#define SC_WID_UNO_VALIDAT ( SC_WID_UNO_START + 7 ) -#define SC_WID_UNO_VALILOC ( SC_WID_UNO_START + 8 ) -#define SC_WID_UNO_VALIXML ( SC_WID_UNO_START + 9 ) -#define SC_WID_UNO_POS ( SC_WID_UNO_START + 10 ) -#define SC_WID_UNO_SIZE ( SC_WID_UNO_START + 11 ) -#define SC_WID_UNO_FORMLOC ( SC_WID_UNO_START + 12 ) -#define SC_WID_UNO_FORMRT ( SC_WID_UNO_START + 13 ) -#define SC_WID_UNO_PAGESTL ( SC_WID_UNO_START + 14 ) -#define SC_WID_UNO_CELLVIS ( SC_WID_UNO_START + 15 ) -#define SC_WID_UNO_LINKDISPBIT ( SC_WID_UNO_START + 16 ) -#define SC_WID_UNO_LINKDISPNAME ( SC_WID_UNO_START + 17 ) -#define SC_WID_UNO_CELLWID ( SC_WID_UNO_START + 18 ) -#define SC_WID_UNO_OWIDTH ( SC_WID_UNO_START + 19 ) -#define SC_WID_UNO_NEWPAGE ( SC_WID_UNO_START + 20 ) -#define SC_WID_UNO_MANPAGE ( SC_WID_UNO_START + 21 ) -#define SC_WID_UNO_CELLHGT ( SC_WID_UNO_START + 22 ) -#define SC_WID_UNO_CELLFILT ( SC_WID_UNO_START + 23 ) -#define SC_WID_UNO_OHEIGHT ( SC_WID_UNO_START + 24 ) -#define SC_WID_UNO_DISPNAME ( SC_WID_UNO_START + 25 ) -#define SC_WID_UNO_HEADERSET ( SC_WID_UNO_START + 26 ) -#define SC_WID_UNO_FOOTERSET ( SC_WID_UNO_START + 27 ) -#define SC_WID_UNO_NUMRULES ( SC_WID_UNO_START + 28 ) +#define SC_WID_UNO_CELLSTYL ( SC_WID_UNO_START + 0 ) +#define SC_WID_UNO_CHCOLHDR ( SC_WID_UNO_START + 1 ) +#define SC_WID_UNO_CHROWHDR ( SC_WID_UNO_START + 2 ) +#define SC_WID_UNO_CONDFMT ( SC_WID_UNO_START + 3 ) +#define SC_WID_UNO_CONDLOC ( SC_WID_UNO_START + 4 ) +#define SC_WID_UNO_CONDXML ( SC_WID_UNO_START + 5 ) +#define SC_WID_UNO_TBLBORD ( SC_WID_UNO_START + 6 ) +#define SC_WID_UNO_VALIDAT ( SC_WID_UNO_START + 7 ) +#define SC_WID_UNO_VALILOC ( SC_WID_UNO_START + 8 ) +#define SC_WID_UNO_VALIXML ( SC_WID_UNO_START + 9 ) +#define SC_WID_UNO_POS ( SC_WID_UNO_START + 10 ) +#define SC_WID_UNO_SIZE ( SC_WID_UNO_START + 11 ) +#define SC_WID_UNO_FORMLOC ( SC_WID_UNO_START + 12 ) +#define SC_WID_UNO_FORMRT ( SC_WID_UNO_START + 13 ) +#define SC_WID_UNO_PAGESTL ( SC_WID_UNO_START + 14 ) +#define SC_WID_UNO_CELLVIS ( SC_WID_UNO_START + 15 ) +#define SC_WID_UNO_LINKDISPBIT ( SC_WID_UNO_START + 16 ) +#define SC_WID_UNO_LINKDISPNAME ( SC_WID_UNO_START + 17 ) +#define SC_WID_UNO_CELLWID ( SC_WID_UNO_START + 18 ) +#define SC_WID_UNO_OWIDTH ( SC_WID_UNO_START + 19 ) +#define SC_WID_UNO_NEWPAGE ( SC_WID_UNO_START + 20 ) +#define SC_WID_UNO_MANPAGE ( SC_WID_UNO_START + 21 ) +#define SC_WID_UNO_CELLHGT ( SC_WID_UNO_START + 22 ) +#define SC_WID_UNO_CELLFILT ( SC_WID_UNO_START + 23 ) +#define SC_WID_UNO_OHEIGHT ( SC_WID_UNO_START + 24 ) +#define SC_WID_UNO_DISPNAME ( SC_WID_UNO_START + 25 ) +#define SC_WID_UNO_HEADERSET ( SC_WID_UNO_START + 26 ) +#define SC_WID_UNO_FOOTERSET ( SC_WID_UNO_START + 27 ) +#define SC_WID_UNO_NUMRULES ( SC_WID_UNO_START + 28 ) #define SC_WID_UNO_ISACTIVE ( SC_WID_UNO_START + 29 ) #define SC_WID_UNO_BORDCOL ( SC_WID_UNO_START + 30 ) #define SC_WID_UNO_PROTECT ( SC_WID_UNO_START + 31 ) @@ -89,7 +89,7 @@ inline BOOL IsScUnoWid( USHORT nWid ) inline BOOL IsScItemWid( USHORT nWid ) { - return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX; // incl. page + return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX; // incl. page } #endif diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 88dea98ec22a..35020f872153 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -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 @@ -36,12 +36,12 @@ //------------------------------------------------------------------------- -#define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" +#define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" // Object-Ids fuer UserData -#define SC_UD_OBJDATA 1 -#define SC_UD_IMAPDATA 2 -#define SC_UD_MACRODATA 3 +#define SC_UD_OBJDATA 1 +#define SC_UD_IMAPDATA 2 +#define SC_UD_MACRODATA 3 //------------------------------------------------------------------------- @@ -72,18 +72,18 @@ private: class ScIMapInfo : public SdrObjUserData { - ImageMap aImageMap; + ImageMap aImageMap; public: ScIMapInfo(); ScIMapInfo( const ImageMap& rImageMap ); ScIMapInfo( const ScIMapInfo& rIMapInfo ); - virtual ~ScIMapInfo(); + virtual ~ScIMapInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const; - void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } - const ImageMap& GetImageMap() const { return aImageMap; } + void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } + const ImageMap& GetImageMap() const { return aImageMap; } }; //------------------------------------------------------------------------- diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index 7190cd189156..36e1d3523c28 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -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 @@ -36,25 +36,25 @@ class SC_DLLPUBLIC ScUserListData : public ScDataObject { friend class ScUserList; - String aStr; - USHORT nTokenCount; + String aStr; + USHORT nTokenCount; String* pSubStrings; String* pUpperSub; - SC_DLLPRIVATE void InitTokens(); + SC_DLLPRIVATE void InitTokens(); public: ScUserListData(const String& rStr); ScUserListData(const ScUserListData& rData); - virtual ~ScUserListData(); + virtual ~ScUserListData(); - virtual ScDataObject* Clone() const { return new ScUserListData(*this); } + virtual ScDataObject* Clone() const { return new ScUserListData(*this); } - const String& GetString() const { return aStr; } - void SetString( const String& rStr); - USHORT GetSubCount() const; - BOOL GetSubIndex(const String& rSubStr, USHORT& rIndex) const; - String GetSubStr(USHORT nIndex) const; + const String& GetString() const { return aStr; } + void SetString( const String& rStr); + USHORT GetSubCount() const; + BOOL GetSubIndex(const String& rSubStr, USHORT& rIndex) const; + String GetSubStr(USHORT nIndex) const; StringCompare Compare(const String& rSubStr1, const String& rSubStr2) const; StringCompare ICompare(const String& rSubStr1, const String& rSubStr2) const; }; @@ -66,19 +66,19 @@ public: ScUserList( USHORT nLim = 4, USHORT nDel = 4); ScUserList( const ScUserList& rUserList ) : ScCollection ( rUserList ) {} - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScUserListData* GetData( const String& rSubStr ) const; + ScUserListData* GetData( const String& rSubStr ) const; /// If the list in rStr is already inserted BOOL HasEntry( const String& rStr ) const; - inline ScUserListData* operator[]( const USHORT nIndex) const; - inline ScUserList& operator= ( const ScUserList& r ); - BOOL operator==( const ScUserList& r ) const; - inline BOOL operator!=( const ScUserList& r ) const; + inline ScUserListData* operator[]( const USHORT nIndex) const; + inline ScUserList& operator= ( const ScUserList& r ); + BOOL operator==( const ScUserList& r ) const; + inline BOOL operator!=( const ScUserList& r ) const; }; -inline ScUserList& ScUserList::operator=( const ScUserList& r ) +inline ScUserList& ScUserList::operator=( const ScUserList& r ) { return (ScUserList&)ScCollection::operator=( r ); } inline ScUserListData* ScUserList::operator[]( const USHORT nIndex) const diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 1bff57055f82..fc454122dc93 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -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 @@ -59,29 +59,29 @@ enum ScValidErrorStyle }; // -// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) +// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) // class SC_DLLPUBLIC ScValidationData : public ScConditionEntry { - sal_uInt32 nKey; // Index in Attributen + sal_uInt32 nKey; // Index in Attributen - ScValidationMode eDataMode; - BOOL bShowInput; - BOOL bShowError; - ScValidErrorStyle eErrorStyle; + ScValidationMode eDataMode; + BOOL bShowInput; + BOOL bShowError; + ScValidErrorStyle eErrorStyle; sal_Int16 mnListType; // selection list type: none, unsorted, sorted. - String aInputTitle; - String aInputMessage; - String aErrorTitle; - String aErrorMessage; + String aInputTitle; + String aInputMessage; + String aErrorTitle; + String aErrorMessage; - BOOL bIsUsed; // temporaer beim Speichern + BOOL bIsUsed; // temporaer beim Speichern - BOOL DoMacro( const ScAddress& rPos, const String& rInput, + BOOL DoMacro( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; - BOOL DoScript( const ScAddress& rPos, const String& rInput, + BOOL DoScript( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; using ScConditionEntry::operator==; @@ -98,26 +98,26 @@ public: ScDocument* pDocument, const ScAddress& rPos ); ScValidationData( const ScValidationData& r ); ScValidationData( ScDocument* pDocument, const ScValidationData& r ); - virtual ~ScValidationData(); + virtual ~ScValidationData(); - ScValidationData* Clone() const // echte Kopie + ScValidationData* Clone() const // echte Kopie { return new ScValidationData( GetDocument(), *this ); } ScValidationData* Clone(ScDocument* pNew) const { return new ScValidationData( pNew, *this ); } - void ResetInput(); - void ResetError(); - void SetInput( const String& rTitle, const String& rMsg ); - void SetError( const String& rTitle, const String& rMsg, + void ResetInput(); + void ResetError(); + void SetInput( const String& rTitle, const String& rMsg ); + void SetError( const String& rTitle, const String& rMsg, ScValidErrorStyle eStyle ); - BOOL GetInput( String& rTitle, String& rMsg ) const + BOOL GetInput( String& rTitle, String& rMsg ) const { rTitle = aInputTitle; rMsg = aInputMessage; return bShowInput; } - BOOL GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; + BOOL GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; - BOOL HasErrMsg() const { return bShowError; } + BOOL HasErrMsg() const { return bShowError; } - ScValidationMode GetDataMode() const { return eDataMode; } + ScValidationMode GetDataMode() const { return eDataMode; } inline sal_Int16 GetListType() const { return mnListType; } inline void SetListType( sal_Int16 nListType ) { mnListType = nListType; } @@ -132,28 +132,28 @@ public: @return true = rStrings has been filled with at least one entry. */ bool FillSelectionList( TypedScStrCollection& rStrings, const ScAddress& rPos ) const; - // mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED - BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, + // mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED + BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const; - BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; // TRUE -> Abbruch - BOOL DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; - void DoCalcError( ScFormulaCell* pCell ) const; + BOOL DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; + void DoCalcError( ScFormulaCell* pCell ) const; - BOOL IsEmpty() const; - sal_uInt32 GetKey() const { return nKey; } - void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! + BOOL IsEmpty() const; + sal_uInt32 GetKey() const { return nKey; } + void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(BOOL bSet) { bIsUsed = bSet; } + BOOL IsUsed() const { return bIsUsed; } - BOOL EqualEntries( const ScValidationData& r ) const; // fuer Undo + BOOL EqualEntries( const ScValidationData& r ) const; // fuer Undo - // sortiert (per PTRARR) nach Index - // operator== nur fuer die Sortierung - BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } + // sortiert (per PTRARR) nach Index + // operator== nur fuer die Sortierung + BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } + BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } private: /** Tries to fill the passed collection with list validation entries. @@ -176,7 +176,7 @@ private: }; // -// Liste der Bedingungen: +// Liste der Bedingungen: // typedef ScValidationData* ScValidationDataPtr; @@ -192,21 +192,21 @@ public: ScValidationDataList(ScDocument* pNewDoc, const ScValidationDataList& rList); ~ScValidationDataList() {} - void InsertNew( ScValidationData* pNew ) + void InsertNew( ScValidationData* pNew ) { if (!Insert(pNew)) delete pNew; } ScValidationData* GetData( sal_uInt32 nKey ); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - /** Temporarily during save, returns RefManager's decision whether ALL + /** Temporarily during save, returns RefManager's decision whether ALL * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 44625ad2aeb5..460a5f5c0aaa 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -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 @@ -68,10 +68,10 @@ enum ScVObjType VOBJ_TYPE_DRAW }; -#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 -#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 +#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 +#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 -#define SC_STD_GRIDCOLOR COL_LIGHTGRAY +#define SC_STD_GRIDCOLOR COL_LIGHTGRAY //================================================================== // SvxGrid-Optionen mit Standard-Operatoren @@ -83,10 +83,10 @@ public: ScGridOptions() : SvxOptionsGrid() {} ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {} - void SetDefaults(); - const ScGridOptions& operator= ( const ScGridOptions& rCpy ); - int operator== ( const ScGridOptions& rOpt ) const; - int operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } + void SetDefaults(); + const ScGridOptions& operator= ( const ScGridOptions& rCpy ); + int operator== ( const ScGridOptions& rOpt ) const; + int operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } }; //================================================================== @@ -100,31 +100,31 @@ public: ScViewOptions( const ScViewOptions& rCpy ); ~ScViewOptions(); - void SetDefaults(); + void SetDefaults(); - void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } - BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } + void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } + BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } - void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } - ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } + void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } + ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } - void SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;} - Color GetGridColor( String* pStrName = NULL ) const; + void SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;} + Color GetGridColor( String* pStrName = NULL ) const; - const ScGridOptions& GetGridOptions() const { return aGridOpt; } - void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; + const ScGridOptions& GetGridOptions() const { return aGridOpt; } + void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } + SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; - const ScViewOptions& operator= ( const ScViewOptions& rCpy ); - int operator== ( const ScViewOptions& rOpt ) const; - int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } + const ScViewOptions& operator= ( const ScViewOptions& rCpy ); + int operator== ( const ScViewOptions& rOpt ) const; + int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } private: - BOOL aOptArr [MAX_OPT]; - ScVObjMode aModeArr [MAX_TYPE]; - Color aGridCol; - String aGridColName; - ScGridOptions aGridOpt; + BOOL aOptArr [MAX_OPT]; + ScVObjMode aModeArr [MAX_TYPE]; + Color aGridCol; + String aGridColName; + ScGridOptions aGridOpt; }; //================================================================== @@ -144,10 +144,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScViewOptions& GetViewOptions() const { return theOptions; } + const ScViewOptions& GetViewOptions() const { return theOptions; } private: - ScViewOptions theOptions; + ScViewOptions theOptions; }; @@ -157,9 +157,9 @@ private: class ScViewCfg : public ScViewOptions { - ScLinkConfigItem aLayoutItem; - ScLinkConfigItem aDisplayItem; - ScLinkConfigItem aGridItem; + ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aDisplayItem; + ScLinkConfigItem aGridItem; DECL_LINK( LayoutCommitHdl, void* ); DECL_LINK( DisplayCommitHdl, void* ); @@ -172,7 +172,7 @@ class ScViewCfg : public ScViewOptions public: ScViewCfg(); - void SetOptions( const ScViewOptions& rNew ); + void SetOptions( const ScViewOptions& rNew ); }; diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 19b5c60fd070..9d3d822703b4 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -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 @@ -52,7 +52,7 @@ class ScTabViewShell; -#define SC_VIEWPANE_ACTIVE 0xFFFF +#define SC_VIEWPANE_ACTIVE 0xFFFF typedef ::com::sun::star::uno::Reference< @@ -80,8 +80,8 @@ typedef ::com::sun::star::uno::Reference< SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4, 4 ) -// ScViewPaneBase not derived from OWeakObject -// to avoid duplicate OWeakObject in ScTabViewObj +// ScViewPaneBase not derived from OWeakObject +// to avoid duplicate OWeakObject in ScTabViewObj class ScViewPaneBase : public com::sun::star::sheet::XViewPane, public com::sun::star::sheet::XCellRangeReferrer, @@ -91,15 +91,15 @@ class ScViewPaneBase : public com::sun::star::sheet::XViewPane, public SfxListener { private: - ScTabViewShell* pViewShell; - USHORT nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE + ScTabViewShell* pViewShell; + USHORT nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE protected: ::com::sun::star::awt::Rectangle GetVisArea() const; public: ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP); - virtual ~ScViewPaneBase(); + virtual ~ScViewPaneBase(); ScTabViewShell* GetViewShell() const { return pViewShell; } @@ -107,14 +107,14 @@ public: const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XViewPane virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) + virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) + virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() throw(::com::sun::star::uno::RuntimeException); @@ -157,22 +157,22 @@ public: }; -// ScViewPaneObj for direct use (including OWeakObject) +// ScViewPaneObj for direct use (including OWeakObject) class ScViewPaneObj : public ScViewPaneBase, public cppu::OWeakObject { public: ScViewPaneObj(ScTabViewShell* pViewSh, USHORT nP); - virtual ~ScViewPaneObj(); + virtual ~ScViewPaneObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); }; -// OWeakObject is base of SfxBaseController -> use ScViewPaneBase +// OWeakObject is base of SfxBaseController -> use ScViewPaneBase class ScTabViewObj : public ScViewPaneBase, public SfxBaseController, @@ -190,17 +190,17 @@ class ScTabViewObj : public ScViewPaneBase, public com::sun::star::datatransfer::XTransferableSupplier { private: - SfxItemPropertySet aPropSet; - XSelectionChangeListenerArr_Impl aSelectionListeners; - XRangeSelectionListenerArr_Impl aRangeSelListeners; - XRangeSelectionChangeListenerArr_Impl aRangeChgListeners; - XViewPropertyChangeListenerArr_Impl aPropertyChgListeners; + SfxItemPropertySet aPropSet; + XSelectionChangeListenerArr_Impl aSelectionListeners; + XRangeSelectionListenerArr_Impl aRangeSelListeners; + XRangeSelectionChangeListenerArr_Impl aRangeChgListeners; + XViewPropertyChangeListenerArr_Impl aPropertyChgListeners; XMouseClickHandlerArr_Impl aMouseClickHandlers; XActivationEventListenerArr_Impl aActivationListeners; SCTAB nPreviousTab; - sal_Bool bDrawSelModeSet; + sal_Bool bDrawSelModeSet; - ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; + ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; INT16 GetZoom(void) const; void SetZoom(INT16 Zoom); INT16 GetZoomType(void) const; @@ -215,24 +215,24 @@ private: ScTabViewObj(); // disabled public: ScTabViewObj(ScTabViewShell* pViewSh); - virtual ~ScTabViewObj(); + virtual ~ScTabViewObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - void SelectionChanged(); - void VisAreaChanged(); + void SelectionChanged(); + void VisAreaChanged(); void SheetChanged(); bool IsMouseListening() const; sal_Bool MousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); sal_Bool MouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - void RangeSelDone( const String& rText ); - void RangeSelAborted( const String& rText ); - void RangeSelChanged( const String& rText ); + void RangeSelDone( const String& rText ); + void RangeSelAborted( const String& rText ); + void RangeSelChanged( const String& rText ); // XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) @@ -240,20 +240,20 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - //! XPrintable? + //! XPrintable? // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -265,25 +265,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -309,7 +309,7 @@ public: // XSpreadsheetView virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL getActiveSheet() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet ) throw(::com::sun::star::uno::RuntimeException); @@ -337,29 +337,29 @@ public: virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitColumn() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitRow() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) + virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) throw(::com::sun::star::uno::RuntimeException); // XViewFreezable virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) + virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) throw(::com::sun::star::uno::RuntimeException); // XRangeSelection - virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx index b17435f23d7f..dddd2b691cfe 100644 --- a/sc/inc/waitoff.hxx +++ b/sc/inc/waitoff.hxx @@ -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 @@ -35,8 +35,8 @@ class Window; class ScWaitCursorOff { private: - Window* pWin; - ULONG nWaiters; + Window* pWin; + ULONG nWaiters; public: ScWaitCursorOff( Window* pWin ); ~ScWaitCursorOff(); diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx index 15d35a70d8a2..492911cfc9e8 100644 --- a/sc/inc/warnpassword.hxx +++ b/sc/inc/warnpassword.hxx @@ -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 @@ -30,13 +30,13 @@ -class SfxMedium; +class SfxMedium; /** Static API helper functions. */ -class ScWarnPassword +class ScWarnPassword { public: - /** Opens a query warning dialog. - @descr Pop up Query on export with a choice of yes/no if a + /** Opens a query warning dialog. + @descr Pop up Query on export with a choice of yes/no if a an encrypted password is imported. @return true if yes and false if no. default to true. */ diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index 926b6ef50cd1..33bc4e9d72a2 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -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 @@ -51,8 +51,8 @@ namespace com { namespace sun { namespace star { class ScXMLImportWrapper { - ScDocument& rDoc; - SfxMedium* pMedium; + ScDocument& rDoc; + SfxMedium* pMedium; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage; //UNUSED2008-05 com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator( @@ -71,7 +71,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference& xModel, com::sun::star::uno::Reference& xWriter, com::sun::star::uno::Sequence& aDescriptor, - const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, const sal_Bool bPlainText, com::sun::star::uno::Sequence& aArgs, ScMySharedData*& pSharedData); diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 7c5e9a2f07cb..a3c058ae1426 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -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/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 160dc1ebd20a..56fa3dc82e96 100755 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.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/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java index b23abe2d6a57..0a48e6584903 100755 --- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java +++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.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 @@ -48,7 +48,7 @@ import java.io.PrintWriter; import util.SOfficeFactory; /** - * Check the XCellRangesQuery interface on the SheetCell service. test was + * Check the XCellRangesQuery interface on the SheetCell service. test was * created for bug i20044. */ public class CheckXCellRangesQuery extends ComplexTestCase { @@ -65,7 +65,7 @@ public class CheckXCellRangesQuery extends ComplexTestCase { } /** - * Creates Spreadsheet document and the test object, + * Creates Spreadsheet document and the test object, * before the actual test starts. */ public void before() { diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index d013daa24e1f..8774bdd7c33b 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.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/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java index 57d6474f51b8..09e4d7e6eeb1 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.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 @@ -63,7 +63,7 @@ public class _XPropertySet { * The object that is testsed. */ private XPropertySet oObj = null; - + /** * The test parameters */ @@ -79,7 +79,7 @@ public class _XPropertySet { */ boolean propertyChanged = false; - + /** * The own property change listener */ @@ -149,7 +149,7 @@ public class _XPropertySet { this.log = log; this.param = param; } - + /** * Tests method getPropertySetInfo. After test completed * call {@link #getPropsToTest} method to retrieve different kinds @@ -250,7 +250,7 @@ public class _XPropertySet { vetoableChanged = false; boolean result = true; - + if ( PTT.constrained.equals("none") ) { log.println("*** No constrained properties found ***"); } else { @@ -306,7 +306,7 @@ public class _XPropertySet { Object gValue = null; Object sValue = null; - + boolean result = true; if ( PTT.normal.equals("none") ) { @@ -400,7 +400,7 @@ public class _XPropertySet { propertyChanged = false; boolean result = true; - + if ( PTT.bound.equals("none") ) { log.println("*** No bound properties found ***"); } else { diff --git a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java index 97763be2b199..b38659a9729d 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java +++ b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.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 @@ -54,7 +54,7 @@ public class _XNamed { /** * The object that is testsed. */ - public XNamed oObj = null; + public XNamed oObj = null; /** * The test parameters @@ -65,7 +65,7 @@ public class _XNamed { * The log writer */ private LogWriter log = null; - + /** * Constructor: gets the object to test, a logger and the test parameters * @param xObj The test object diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java index 8358e5bb6106..d5651b604379 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.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/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java index d7f6e81b91e5..9fa0abf0baa3 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java +++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.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 @@ -62,7 +62,7 @@ public class _XDataPilotTable { XCell xCellForCheck = null; CellAddress OutputRange = null; int changeValue = 0; - + /** * The test parameters */ @@ -72,14 +72,14 @@ public class _XDataPilotTable { * The log writer */ private LogWriter log = null; - + /** * Constructor: gets the object to test, a logger and the test parameters * @param xObj The test object * @param log A log writer * @param param The test parameters */ - public _XDataPilotTable(XDataPilotTable xObj, + public _XDataPilotTable(XDataPilotTable xObj, LogWriter log, TestParameters param) { oObj = xObj; this.log = log; diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index 9528c34b9267..fb39b7ca069c 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.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 @@ -76,7 +76,7 @@ public class CalcRTL extends ComplexTestCase { */ public String[] getTestMethodNames() { return new String[] { - "checkSpreadsheetProperties", "checkShapeProperties", + "checkSpreadsheetProperties", "checkShapeProperties", "checkInfluenceOfSpreadsheetChange" }; } @@ -97,19 +97,19 @@ public class CalcRTL extends ComplexTestCase { XPropertySet set = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, getSpreadsheet()); - assure("Problems when setting property 'IsVisible'", + assure("Problems when setting property 'IsVisible'", changeProperty(set, "IsVisible", Boolean.FALSE)); - assure("Problems when setting property 'IsVisible'", + assure("Problems when setting property 'IsVisible'", changeProperty(set, "IsVisible", Boolean.TRUE)); - assure("Problems when setting property 'PageStyle'", + assure("Problems when setting property 'PageStyle'", changeProperty(set, "PageStyle", "Report")); - assure("Problems when setting property 'PageStyle'", + assure("Problems when setting property 'PageStyle'", changeProperty(set, "PageStyle", "Default")); - assure("Problems when setting property 'TableLayout'", - changeProperty(set, "TableLayout", + assure("Problems when setting property 'TableLayout'", + changeProperty(set, "TableLayout", new Short(com.sun.star.text.WritingMode2.RL_TB))); - assure("Problems when setting property 'TableLayout'", - changeProperty(set, "TableLayout", + assure("Problems when setting property 'TableLayout'", + changeProperty(set, "TableLayout", new Short(com.sun.star.text.WritingMode2.LR_TB))); assure("Couldn't close document", closeSpreadsheetDocument()); } @@ -132,17 +132,17 @@ public class CalcRTL extends ComplexTestCase { XPropertySet.class, getInsertedShape()); try { - assure("Problems when setting property 'Anchor'", - changeProperty(set, "Anchor", + assure("Problems when setting property 'Anchor'", + changeProperty(set, "Anchor", getSpreadsheet().getCellByPosition(5, 5))); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { assure("Problems when setting property 'Anchor'", false); } - assure("Problems when setting property 'HoriOrientPosition'", + assure("Problems when setting property 'HoriOrientPosition'", changeProperty(set, "HoriOrientPosition", new Integer(1000))); - assure("Problems when setting property 'VertOrientPosition'", + assure("Problems when setting property 'VertOrientPosition'", changeProperty(set, "VertOrientPosition", new Integer(1000))); assure("Couldn't close document", closeSpreadsheetDocument()); @@ -158,31 +158,31 @@ public class CalcRTL extends ComplexTestCase { XPropertySet.class, oShape); String[] previous = getShapeProps(shapeProps, oShape); - assure("Problems when setting property 'TableLayout'", - changeProperty(sheetProps, "TableLayout", + assure("Problems when setting property 'TableLayout'", + changeProperty(sheetProps, "TableLayout", new Short(com.sun.star.text.WritingMode2.RL_TB))); String[] RL_TB = getShapeProps(shapeProps, oShape); - assure("Problems when setting property 'TableLayout'", - changeProperty(sheetProps, "TableLayout", + assure("Problems when setting property 'TableLayout'", + changeProperty(sheetProps, "TableLayout", new Short(com.sun.star.text.WritingMode2.LR_TB))); String[] LR_TB = getShapeProps(shapeProps, oShape); - assure("Anchor has changed", + assure("Anchor has changed", (previous[0].equals(RL_TB[0]) && previous[0].equals(LR_TB[0]))); - assure("HoriOrientPosition has changed", + assure("HoriOrientPosition has changed", (Integer.valueOf(previous[1]).intValue() + Integer.valueOf( RL_TB[1]) - .intValue() + + .intValue() + Integer.valueOf(LR_TB[1]).intValue() == 2099)); - assure("VertOrientPosition has changed", + assure("VertOrientPosition has changed", (Integer.valueOf(previous[2]).intValue() + Integer.valueOf( RL_TB[2]) - .intValue() + + .intValue() + Integer.valueOf(LR_TB[2]).intValue() == 3*Integer.valueOf(previous[2]).intValue())); - assure("x-position hasn't changed", - (previous[3].equals(LR_TB[3]) && - ((Integer.valueOf(previous[3]).intValue() * (-1)) - + assure("x-position hasn't changed", + (previous[3].equals(LR_TB[3]) && + ((Integer.valueOf(previous[3]).intValue() * (-1)) - oShape.getSize().Width != Integer.valueOf(LR_TB[2]) .intValue()))); assure("Couldn't close document", closeSpreadsheetDocument()); @@ -203,7 +203,7 @@ public class CalcRTL extends ComplexTestCase { log.println("\t Anchor :" + reValue[0]); log.println("\t HoriOrientPosition :" + reValue[1]); log.println("\t VertOrientPosition :" + reValue[2]); - log.println("\t Shape Position (x,y) : (" + oShape.getPosition().X + + log.println("\t Shape Position (x,y) : (" + oShape.getPosition().X + "," + oShape.getPosition().Y + ")"); return reValue; @@ -292,7 +292,7 @@ public class CalcRTL extends ComplexTestCase { * @param pName : The name of the Property that has to be changed * @param pValue : The value, the property should be changed too. */ - protected boolean changeProperty(XPropertySet set, String pName, + protected boolean changeProperty(XPropertySet set, String pName, Object pValue) { boolean worked = true; @@ -322,10 +322,10 @@ public class CalcRTL extends ComplexTestCase { // checking results - worked = checkResult(set, pName, oldValue, pValue, resValue, + worked = checkResult(set, pName, oldValue, pValue, resValue, exception); } catch (Exception e) { - System.out.println("Exception occured while testing property '" + + System.out.println("Exception occured while testing property '" + pName + "'"); e.printStackTrace(); worked = false; @@ -344,8 +344,8 @@ public class CalcRTL extends ComplexTestCase { * @param resValue : the value getPropertyValue returned for the property * @param exception : the exeption thrown during the change of the property */ - protected boolean checkResult(XPropertySet set, String propName, - Object oldValue, Object newValue, + protected boolean checkResult(XPropertySet set, String propName, + Object oldValue, Object newValue, Object resValue, Exception exception) throws Exception { XPropertySetInfo info = set.getPropertySetInfo(); @@ -373,7 +373,7 @@ public class CalcRTL extends ComplexTestCase { return false; } else if (oldValue == null) { - log.println(propName + + log.println(propName + " has null value, and therefore can't be changed"); return true; @@ -411,14 +411,14 @@ public class CalcRTL extends ComplexTestCase { // if no exception - check that value // has not changed if (!ValueComparer.equalValue(resValue, oldValue)) { - log.println("Read only property '" + propName + + log.println("Read only property '" + propName + "' has changed"); try { - if (!util.utils.isVoid(oldValue) && + if (!util.utils.isVoid(oldValue) && oldValue instanceof Any) { oldValue = AnyConverter.toObject( - new Type(((Any) oldValue).getClass()), + new Type(((Any) oldValue).getClass()), oldValue); } @@ -430,7 +430,7 @@ public class CalcRTL extends ComplexTestCase { return false; } else { - log.println("Read only property '" + propName + + log.println("Read only property '" + propName + "' hasn't changed"); log.println("Property '" + propName + "' OK"); @@ -441,16 +441,16 @@ public class CalcRTL extends ComplexTestCase { if (exception == null) { // if no exception thrown // check that the new value is set - if ((!ValueComparer.equalValue(resValue, newValue)) || + if ((!ValueComparer.equalValue(resValue, newValue)) || (ValueComparer.equalValue(resValue, oldValue))) { - log.println("Value for '" + propName + + log.println("Value for '" + propName + "' hasn't changed as expected"); try { - if (!util.utils.isVoid(oldValue) && + if (!util.utils.isVoid(oldValue) && oldValue instanceof Any) { oldValue = AnyConverter.toObject( - new Type(((Any) oldValue).getClass()), + new Type(((Any) oldValue).getClass()), oldValue); } @@ -461,7 +461,7 @@ public class CalcRTL extends ComplexTestCase { } if (resValue != null) { - if ((!ValueComparer.equalValue(resValue, oldValue)) || + if ((!ValueComparer.equalValue(resValue, oldValue)) || (!resValue.equals(oldValue))) { log.println("But it has changed."); @@ -478,10 +478,10 @@ public class CalcRTL extends ComplexTestCase { log.println("Property '" + propName + "' OK"); try { - if (!util.utils.isVoid(oldValue) && + if (!util.utils.isVoid(oldValue) && oldValue instanceof Any) { oldValue = AnyConverter.toObject( - new Type(((Any) oldValue).getClass()), + new Type(((Any) oldValue).getClass()), oldValue); } @@ -515,9 +515,9 @@ public class CalcRTL extends ComplexTestCase { if (UnoRuntime.queryInterface(XCellRangeAddressable.class, obj) != null) { XCellRangeAddressable aCell = (XCellRangeAddressable) UnoRuntime.queryInterface( - XCellRangeAddressable.class, + XCellRangeAddressable.class, obj); - value = "Cell in Column " + aCell.getRangeAddress().StartColumn + + value = "Cell in Column " + aCell.getRangeAddress().StartColumn + " and Row " + aCell.getRangeAddress().StartRow; } else { return obj; @@ -536,18 +536,18 @@ public class CalcRTL extends ComplexTestCase { log.println("getting Drawpages"); XDrawPagesSupplier oDPS = (XDrawPagesSupplier) UnoRuntime.queryInterface( - XDrawPagesSupplier.class, + XDrawPagesSupplier.class, xSheetDoc); XDrawPages oDP = (XDrawPages) oDPS.getDrawPages(); XDrawPage firstDrawPage = (XDrawPage) UnoRuntime.queryInterface( - XDrawPage.class, + XDrawPage.class, oDP.getByIndex(0)); SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) param.getMSF()); XComponent xComp = (XComponent) UnoRuntime.queryInterface( XComponent.class, xSheetDoc); - insertedShape = SOF.createShape(xComp, 5000, 3500, 700, 500, + insertedShape = SOF.createShape(xComp, 5000, 3500, 700, 500, "Rectangle"); DrawTools.getShapes(firstDrawPage).add(insertedShape); } catch (com.sun.star.lang.WrappedTargetException e) { diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi index 5c7e22a62dec..dd4050d11504 100644 --- a/sc/sdi/app.sdi +++ b/sc/sdi/app.sdi @@ -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 @@ -30,12 +30,12 @@ interface StarCalc uuid ( "AB3257C0-07D7-11CF-89CB-008029E4B0B1" ) ] { - FID_AUTOCOMPLETE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DETECTIVE_AUTO [ ExecMethod = Execute; StateMethod = GetState; ] - SID_PSZ_FUNCTION [ ExecMethod = Execute; StateMethod = GetState; ] - FID_FOCUS_POSWND [ ExecMethod = Execute; ] + FID_AUTOCOMPLETE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DETECTIVE_AUTO [ ExecMethod = Execute; StateMethod = GetState; ] + SID_PSZ_FUNCTION [ ExecMethod = Execute; StateMethod = GetState; ] + FID_FOCUS_POSWND [ ExecMethod = Execute; ] - SID_ATTR_METRIC [ ExecMethod = Execute; StateMethod = GetState; ] + SID_ATTR_METRIC [ ExecMethod = Execute; StateMethod = GetState; ] SID_AUTOSPELL_CHECK [ @@ -63,8 +63,8 @@ interface StarCalc Export = FALSE; ] - SID_CHOOSE_DESIGN [ ExecMethod = Execute; ] - SID_EURO_CONVERTER [ ExecMethod = Execute; ] + SID_CHOOSE_DESIGN [ ExecMethod = Execute; ] + SID_EURO_CONVERTER [ ExecMethod = Execute; ] SID_OPEN_XML_FILTERSETTINGS [ ExecMethod = Execute; ] diff --git a/sc/sdi/auditsh.sdi b/sc/sdi/auditsh.sdi index 4504f6af735c..846abd1dfe8d 100644 --- a/sc/sdi/auditsh.sdi +++ b/sc/sdi/auditsh.sdi @@ -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 @@ -26,13 +26,13 @@ ************************************************************************/ interface Auditing { - SID_FILL_ADD_PRED [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FILL_DEL_PRED [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FILL_ADD_SUCC [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FILL_DEL_SUCC [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FILL_NONE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CANCEL [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FILL_SELECT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_ADD_PRED [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_DEL_PRED [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_ADD_SUCC [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_DEL_SUCC [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_NONE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CANCEL [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FILL_SELECT [ ExecMethod = Execute; StateMethod = GetState; ] } shell ScAuditingShell diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 4c27c656d15c..0b89ca00485c 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -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 @@ -35,93 +35,93 @@ interface CellSelection [ ] // Slot's die in der DrawShell disabled werden. { - FID_DEFINE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DEFINE_COLROWNAMERANGES [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OPENDLG_SOLVE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_DEFINE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DEFINE_COLROWNAMERANGES [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OPENDLG_SOLVE [ ExecMethod = Execute; StateMethod = GetState; ] SID_OPENDLG_OPTSOLVER [ ExecMethod = Execute; StateMethod = GetState; ] - SID_OPENDLG_PIVOTTABLE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_OPENDLG_TABOP [ ExecMethod = Execute; StateMethod = GetBlockState; ] - SID_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SPECIAL_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_DEFINE_DBNAME [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_OPENDLG_CONSOLIDATE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_OPENDLG_PIVOTTABLE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_OPENDLG_TABOP [ ExecMethod = Execute; StateMethod = GetBlockState; ] + SID_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SPECIAL_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_DEFINE_DBNAME [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_OPENDLG_CONSOLIDATE [ ExecMethod = Execute; StateMethod = GetState; ] SID_VIEW_DATA_SOURCE_BROWSER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_OPENDLG_FUNCTION [ ExecMethod = Execute; StateMethod = GetCellState; ] - SID_INS_FUNCTION [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OPENDLG_FUNCTION [ ExecMethod = Execute; StateMethod = GetCellState; ] + SID_INS_FUNCTION [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - // no Exec/StateMethod needed, but SfxDispatcher complains if the slot is not included in the shell + // no Exec/StateMethod needed, but SfxDispatcher complains if the slot is not included in the shell SID_VALIDITY_REFERENCE [] // Datenbank-Operationen { - SID_SORT_ASCENDING [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SORT_DESCENDING [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_REIMPORT_DATA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_AUTO_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_AUTOFILTER_HIDE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_UNFILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_SUBTOTALS [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_PIVOT_TABLE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - FID_VALIDATION [ ExecMethod = ExecuteDB; StateMethod = GetBlockState; ] + SID_SORT_ASCENDING [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SORT_DESCENDING [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_REIMPORT_DATA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_AUTO_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_AUTOFILTER_HIDE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_UNFILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_SUBTOTALS [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_PIVOT_TABLE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + FID_VALIDATION [ ExecMethod = ExecuteDB; StateMethod = GetBlockState; ] SID_TEXT_TO_COLUMNS [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] // } Datenbank-Operationen - SID_BORDER_OBJECT [ StateMethod = GetState; ] - SID_RANGE_ADDRESS [ StateMethod = GetState; ] - - SID_HYPERLINK_SETLINK [ ExecMethod = ExecuteEdit; ] - SID_HYPERLINK_GETLINK [ StateMethod = GetHLinkState; ] - SID_UPDATECHART [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - - SID_RANGE_ROW [ StateMethod = GetState; ] - SID_RANGE_COL [ StateMethod = GetState; ] - SID_RANGE_TABLE [ StateMethod = GetState; ] - SID_RANGE_VALUE [ StateMethod = GetState; ] - SID_RANGE_FORMULA [ StateMethod = GetState; ] - SID_RANGE_TEXTVALUE [ StateMethod = GetState; ] - SID_RANGE_NOTETEXT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - - SID_ENTER_STRING [ ExecMethod = Execute; StateMethod = GetState; ] - SID_INSERT_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ] - SID_MARKAREA [ ExecMethod = Execute; ] - SID_SELECT_SCENARIO [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_CELL_FORMAT [ ExecMethod = Execute; StateMethod = GetBlockState; ] - SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetBlockState; ] - FID_ROW_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ] - FID_ROW_OPT_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ] - FID_ROW_HIDE [ ExecMethod = Execute; StateMethod = GetState; ] - FID_ROW_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] - FID_COL_WIDTH [ ExecMethod = Execute; StateMethod = GetState; ] - FID_COL_OPT_WIDTH [ ExecMethod = Execute; StateMethod = GetState; ] - FID_COL_OPT_DIRECT [ ExecMethod = Execute; StateMethod = GetState; ] - FID_COL_HIDE [ ExecMethod = Execute; StateMethod = GetState; ] - FID_COL_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] - SID_AUTOFORMAT [ ExecMethod = Execute; StateMethod = GetBlockState; ] - SID_SOLVE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_SCENARIOS [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DETECTIVE_ADD_PRED [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_DEL_PRED [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_ADD_SUCC [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_DEL_SUCC [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_ADD_ERR [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_INVALID [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DETECTIVE_REFRESH [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_INS_ROW [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_COLUMN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_CELLSDOWN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_CELLSRIGHT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - SID_DEL_ROWS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - SID_DEL_COLS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_CELL [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_DELETE_CELL [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_CELL_CONTENTS [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetBlockState; ] + SID_BORDER_OBJECT [ StateMethod = GetState; ] + SID_RANGE_ADDRESS [ StateMethod = GetState; ] + + SID_HYPERLINK_SETLINK [ ExecMethod = ExecuteEdit; ] + SID_HYPERLINK_GETLINK [ StateMethod = GetHLinkState; ] + SID_UPDATECHART [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + + SID_RANGE_ROW [ StateMethod = GetState; ] + SID_RANGE_COL [ StateMethod = GetState; ] + SID_RANGE_TABLE [ StateMethod = GetState; ] + SID_RANGE_VALUE [ StateMethod = GetState; ] + SID_RANGE_FORMULA [ StateMethod = GetState; ] + SID_RANGE_TEXTVALUE [ StateMethod = GetState; ] + SID_RANGE_NOTETEXT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + + SID_ENTER_STRING [ ExecMethod = Execute; StateMethod = GetState; ] + SID_INSERT_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ] + SID_MARKAREA [ ExecMethod = Execute; ] + SID_SELECT_SCENARIO [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_CELL_FORMAT [ ExecMethod = Execute; StateMethod = GetBlockState; ] + SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetBlockState; ] + FID_ROW_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ] + FID_ROW_OPT_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ] + FID_ROW_HIDE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_ROW_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] + FID_COL_WIDTH [ ExecMethod = Execute; StateMethod = GetState; ] + FID_COL_OPT_WIDTH [ ExecMethod = Execute; StateMethod = GetState; ] + FID_COL_OPT_DIRECT [ ExecMethod = Execute; StateMethod = GetState; ] + FID_COL_HIDE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_COL_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] + SID_AUTOFORMAT [ ExecMethod = Execute; StateMethod = GetBlockState; ] + SID_SOLVE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_SCENARIOS [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DETECTIVE_ADD_PRED [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_DEL_PRED [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_ADD_SUCC [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_DEL_SUCC [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_ADD_ERR [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_INVALID [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DETECTIVE_REFRESH [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_INS_ROW [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_COLUMN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_CELLSDOWN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_CELLSRIGHT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + SID_DEL_ROWS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + SID_DEL_COLS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_CELL [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_DELETE_CELL [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_CELL_CONTENTS [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetBlockState; ] SfxVoidItem Delete SID_DELETE ( @@ -134,70 +134,70 @@ interface CellSelection Cachable , HasDialog ; MenuConfig , AccelConfig ; ] - SID_DELETE_CONTENTS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_INS_ROWBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_INS_COLBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_DEL_ROWBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_DEL_COLBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_FILL_TO_BOTTOM [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_FILL_TO_RIGHT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_FILL_TO_TOP [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_FILL_TO_LEFT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_FILL_TAB [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_FILL_SERIES [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_FILL_AUTO [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_MARKDATAAREA [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_DELETE_CONTENTS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_INS_ROWBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_INS_COLBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_DEL_ROWBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_DEL_COLBRK [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_FILL_TO_BOTTOM [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_FILL_TO_RIGHT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_FILL_TO_TOP [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_FILL_TO_LEFT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_FILL_TAB [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_FILL_SERIES [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_FILL_AUTO [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_MARKDATAAREA [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] SID_MARKARRAYFORMULA [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_SETINPUTMODE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_FOCUS_INPUTLINE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_CUT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - SID_COPY [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - SID_PASTE [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] + SID_SETINPUTMODE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_FOCUS_INPUTLINE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CUT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + SID_COPY [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + SID_PASTE [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_SPECIAL [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] - SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] - SID_EXTERNAL_SOURCE [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] - FID_MERGE_ON [ ExecMethod = Execute; StateMethod = GetState; ] - FID_MERGE_OFF [ ExecMethod = Execute; StateMethod = GetState; ] - FID_MERGE_TOGGLE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_OUTLINE_HIDE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OUTLINE_SHOW [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OUTLINE_MAKE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OUTLINE_REMOVE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_INPUTLINE_STATUS [ ExecMethod = Execute; StateMethod = GetState; ] - FID_INPUTLINE_ENTER [ ExecMethod = Execute; StateMethod = GetState; ] - FID_INPUTLINE_BLOCK [ ExecMethod = Execute; StateMethod = GetState; ] - FID_INPUTLINE_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CHARMAP [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] - - SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] - - SID_TABOP [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_INSERT_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - FID_USE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_CANCEL [ ExecMethod = Execute; ] - SID_TOGGLE_REL [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OPENDLG_CONDFRMT [ ExecMethod = Execute; StateMethod = GetBlockState; ] - FID_CONDITIONAL_FORMAT [ ExecMethod = ExecuteEdit; ] - FID_NOTE_VISIBLE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] + SID_EXTERNAL_SOURCE [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] + FID_MERGE_ON [ ExecMethod = Execute; StateMethod = GetState; ] + FID_MERGE_OFF [ ExecMethod = Execute; StateMethod = GetState; ] + FID_MERGE_TOGGLE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_OUTLINE_HIDE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OUTLINE_SHOW [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OUTLINE_MAKE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OUTLINE_REMOVE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_INPUTLINE_STATUS [ ExecMethod = Execute; StateMethod = GetState; ] + FID_INPUTLINE_ENTER [ ExecMethod = Execute; StateMethod = GetState; ] + FID_INPUTLINE_BLOCK [ ExecMethod = Execute; StateMethod = GetState; ] + FID_INPUTLINE_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CHARMAP [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] + + SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] + + SID_TABOP [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_INSERT_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + FID_USE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_CANCEL [ ExecMethod = Execute; ] + SID_TOGGLE_REL [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_OPENDLG_CONDFRMT [ ExecMethod = Execute; StateMethod = GetBlockState; ] + FID_CONDITIONAL_FORMAT [ ExecMethod = ExecuteEdit; ] + FID_NOTE_VISIBLE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_DELETE_NOTE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_DEC_INDENT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_INC_INDENT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_DEC_INDENT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_INC_INDENT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_THESAURUS [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] + SID_THESAURUS [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] SID_SPELL_DIALOG [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_HANGUL_HANJA_CONVERSION [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] + SID_HANGUL_HANJA_CONVERSION [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_CHINESE_CONVERSION [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_TRANSLITERATE_SENTENCE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] SID_TRANSLITERATE_TITLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] SID_TRANSLITERATE_TOGGLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_UPPER [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_UPPER [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] } // =========================================================================== @@ -237,7 +237,7 @@ interface CellMovement SfxVoidItem GoDown SID_CURSORDOWN ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; @@ -255,41 +255,41 @@ interface CellMovement StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORBLKDOWN [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORBLKDOWN_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORBLKDOWN [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORBLKDOWN_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] SfxVoidItem GoUp SID_CURSORUP ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_CURSORBLKUP [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORBLKUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORBLKUP [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORBLKUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] SfxVoidItem GoLeft SID_CURSORLEFT ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORLEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_CURSORBLKLEFT [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORBLKLEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORLEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORBLKLEFT [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORBLKLEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] SfxVoidItem GoRight SID_CURSORRIGHT ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; @@ -297,65 +297,65 @@ interface CellMovement Cachable ; ] - SID_CURSORRIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_CURSORBLKRIGHT [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORBLKRIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_NEXT_UNPROTECT [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_PREV_UNPROTECT [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_CURSORENTERDOWN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_CURSORENTERUP [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORRIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORBLKRIGHT [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORBLKRIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_NEXT_UNPROTECT [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_PREV_UNPROTECT [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORENTERDOWN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORENTERUP [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] SfxVoidItem GoDownBlock SID_CURSORPAGEDOWN ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORPAGEDOWN_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORPAGEDOWN_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] SfxVoidItem GoUpBlock SID_CURSORPAGEUP ( SfxInt16Item By FN_PARAM_1, - SfxBoolItem Sel FN_PARAM_2 + SfxBoolItem Sel FN_PARAM_2 ) [ ExecMethod = ExecuteCursor ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORPAGEUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_CURSORPAGELEFT_ [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORPAGELEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_CURSORPAGERIGHT_ [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] - SID_CURSORPAGERIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] - SID_ALIGNCURSOR [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORPAGEUP_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORPAGELEFT_ [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORPAGELEFT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_CURSORPAGERIGHT_ [ ExecMethod = ExecuteCursor; StateMethod = GetStateCursor; ] + SID_CURSORPAGERIGHT_SEL [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ] + SID_ALIGNCURSOR [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] SfxVoidItem GoToEndOfData SID_CURSORENDOFFILE ( - SfxBoolItem Sel FN_PARAM_2 //XXX + SfxBoolItem Sel FN_PARAM_2 //XXX ) [ ExecMethod = ExecutePage ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORENDOFFILE_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] + SID_CURSORENDOFFILE_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] SfxVoidItem GoToStart SID_CURSORTOPOFFILE ( - SfxBoolItem Sel FN_PARAM_2 //XXX + SfxBoolItem Sel FN_PARAM_2 //XXX ) [ ExecMethod = ExecutePage ; StateMethod = GetStateCursor ; Cachable ; ] - SID_CURSORTOPOFSCREEN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_CURSORENDOFSCREEN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORTOPOFSCREEN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_CURSORENDOFSCREEN [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] SfxVoidItem GoToStartOfRow SID_CURSORHOME ( @@ -367,30 +367,30 @@ interface CellMovement Cachable ; ] - SID_CURSOREND [ ExecMethod = ExecutePage; StateMethod = GetStateCursor; ] - SID_CURSORTOPOFFILE_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] - SID_CURSORHOME_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] - SID_CURSOREND_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] - SID_SELECT_COL [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_SELECT_ROW [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_SELECT_NONE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] - SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] - SID_STATUS_SUM [ ExecMethod = Execute; StateMethod = GetState; ] - SID_STATUS_DOCPOS [ ExecMethod = Execute; StateMethod = GetState; ] - SID_STATUS_SELMODE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_STATUS_SELMODE_ERG [ ExecMethod = Execute; ] - SID_STATUS_SELMODE_ERW [ ExecMethod = Execute; ] - SID_STATUS_SELMODE_NORM [ ExecMethod = Execute; ] - SID_ATTR_SIZE [ StateMethod = GetState; ] - SID_ATTR_POSITION [ StateMethod = GetState; ] + SID_CURSOREND [ ExecMethod = ExecutePage; StateMethod = GetStateCursor; ] + SID_CURSORTOPOFFILE_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] + SID_CURSORHOME_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] + SID_CURSOREND_SEL [ ExecMethod = ExecutePageSel; StateMethod = GetStateCursor; ] + SID_SELECT_COL [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_SELECT_ROW [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_SELECT_NONE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] + SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] + SID_STATUS_SUM [ ExecMethod = Execute; StateMethod = GetState; ] + SID_STATUS_DOCPOS [ ExecMethod = Execute; StateMethod = GetState; ] + SID_STATUS_SELMODE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_STATUS_SELMODE_ERG [ ExecMethod = Execute; ] + SID_STATUS_SELMODE_ERW [ ExecMethod = Execute; ] + SID_STATUS_SELMODE_NORM [ ExecMethod = Execute; ] + SID_ATTR_SIZE [ StateMethod = GetState; ] + SID_ATTR_POSITION [ StateMethod = GetState; ] SID_TABLE_CELL [ // "Tabellenzelle" soll nicht im Anpassen-Dialog auftauchen: StatusBarConfig = FALSE ; StateMethod = GetState ; ] - SID_DATA_SELECT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DETECTIVE_FILLMODE [ ExecMethod = Execute; StateMethod = GetState; ] // api: + SID_DATA_SELECT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DETECTIVE_FILLMODE [ ExecMethod = Execute; StateMethod = GetState; ] // api: } diff --git a/sc/sdi/chartsh.sdi b/sc/sdi/chartsh.sdi index e40c457b0e5e..f23f96c27a57 100644 --- a/sc/sdi/chartsh.sdi +++ b/sc/sdi/chartsh.sdi @@ -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/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index 94cd06d9f699..d0f2eac558ca 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -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 @@ -31,15 +31,15 @@ interface TableSelection uuid = "BA338A41-064E-11d0-89CB-008029E4B0B1" ; ] { - SID_DELETE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] - SID_OPENDLG_EDIT_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CHANGE_PRINTAREA [ ExecMethod = Execute; ] - FID_DEL_MANUALBREAKS [ ExecMethod = Execute; StateMethod = GetState; ] - FID_RESET_PRINTZOOM [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DELETE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] + SID_OPENDLG_EDIT_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CHANGE_PRINTAREA [ ExecMethod = Execute; ] + FID_DEL_MANUALBREAKS [ ExecMethod = Execute; StateMethod = GetState; ] + FID_RESET_PRINTZOOM [ ExecMethod = Execute; StateMethod = GetState; ] SbxObject Cells SID_SC_CELLS ( - INT16 Column SID_SC_CELLS, - INT32 Row FN_PARAM_1 + INT16 Column SID_SC_CELLS, + INT32 Row FN_PARAM_1 ) [ ] @@ -47,22 +47,22 @@ interface TableSelection [ Readonly ; ] - FID_PROTECT_TABLE [ ExecMethod = Execute; StateMethod = GetState; ] - FID_PROTECT_DOC [ ExecMethod = Execute; StateMethod = GetState; ] + FID_PROTECT_TABLE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_PROTECT_DOC [ ExecMethod = Execute; StateMethod = GetState; ] - SID_AUTO_OUTLINE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_OUTLINE_DELETEALL [ ExecMethod = Execute; StateMethod = GetState; ] - SID_FORMATPAGE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_HFEDIT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DETECTIVE_DEL_ALL [ ExecMethod = Execute; StateMethod = GetState; ] - FID_TABLE_VISIBLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_MOVE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + SID_AUTO_OUTLINE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_OUTLINE_DELETEALL [ ExecMethod = Execute; StateMethod = GetState; ] + SID_FORMATPAGE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_HFEDIT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DETECTIVE_DEL_ALL [ ExecMethod = Execute; StateMethod = GetState; ] + FID_TABLE_VISIBLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_MOVE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] FID_TAB_SET_TAB_BG_COLOR [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - SID_TABLE_ACTIVATE [ ExecMethod = Execute; ] + SID_TABLE_ACTIVATE [ ExecMethod = Execute; ] } @@ -72,42 +72,42 @@ interface TableDocument uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ; ] { - SID_SBA_IMPORT [ ExecMethod = Execute; ] - SID_SC_CELLS [ ExecMethod = Execute; ] - SID_SC_CELLTEXT [ ExecMethod = Execute; ] - SID_SC_SETTEXT [ ExecMethod = Execute; ] - SID_SC_RANGE [ ExecMethod = Execute; ] - SID_SC_SELECTION [ StateMethod = GetSbxState; ] - SID_SC_ACTIVECELL [ StateMethod = GetSbxState; ] - SID_SC_ACTIVETAB [ StateMethod = GetSbxState; ] - SID_TABLES_GET [ StateMethod = GetSbxState; ] - SID_TABLES_COUNT [ StateMethod = GetState; ] - SID_PIVOT_GET [ StateMethod = GetSbxState; ] - SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ] - SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] + SID_SBA_IMPORT [ ExecMethod = Execute; ] + SID_SC_CELLS [ ExecMethod = Execute; ] + SID_SC_CELLTEXT [ ExecMethod = Execute; ] + SID_SC_SETTEXT [ ExecMethod = Execute; ] + SID_SC_RANGE [ ExecMethod = Execute; ] + SID_SC_SELECTION [ StateMethod = GetSbxState; ] + SID_SC_ACTIVECELL [ StateMethod = GetSbxState; ] + SID_SC_ACTIVETAB [ StateMethod = GetSbxState; ] + SID_TABLES_GET [ StateMethod = GetSbxState; ] + SID_TABLES_COUNT [ StateMethod = GetState; ] + SID_PIVOT_GET [ StateMethod = GetSbxState; ] + SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ] + SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] SbxObject OLEObjects [ Readonly ; IsCollection ; ] - SID_CHART_SOURCE [ ExecMethod = Execute; ] - SID_CHART_ADDSOURCE [ ExecMethod = Execute; ] - FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ] - FID_RECALC [ ExecMethod = Execute; StateMethod = GetState; ] - FID_HARD_RECALC [ ExecMethod = Execute; ] - SID_UPDATETABLINKS [ ExecMethod = Execute; ] - SID_REIMPORT_AFTER_LOAD [ ExecMethod = Execute; ] - SID_AUTO_STYLE [ ExecMethod = Execute; ] + SID_CHART_SOURCE [ ExecMethod = Execute; ] + SID_CHART_ADDSOURCE [ ExecMethod = Execute; ] + FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ] + FID_RECALC [ ExecMethod = Execute; StateMethod = GetState; ] + FID_HARD_RECALC [ ExecMethod = Execute; ] + SID_UPDATETABLINKS [ ExecMethod = Execute; ] + SID_REIMPORT_AFTER_LOAD [ ExecMethod = Execute; ] + SID_AUTO_STYLE [ ExecMethod = Execute; ] - SID_GET_COLORTABLE [ ExecMethod = Execute; ] + SID_GET_COLORTABLE [ ExecMethod = Execute; ] - FID_CHG_RECORD [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DOCUMENT_COMPARE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DOCUMENT_MERGE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_CHG_RECORD [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DOCUMENT_COMPARE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DOCUMENT_MERGE [ ExecMethod = Execute; StateMethod = GetState; ] SID_CHG_PROTECT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DELETE_SCENARIO [ ExecMethod = Execute; ] - SID_EDIT_SCENARIO [ ExecMethod = Execute; ] + SID_DELETE_SCENARIO [ ExecMethod = Execute; ] + SID_EDIT_SCENARIO [ ExecMethod = Execute; ] SID_ATTR_CHAR_FONTLIST [ StateMethod = GetState; ] SID_SHARE_DOC [ ExecMethod = Execute; StateMethod = GetState; ] } diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 98c7bf3a009d..e73f447a3d2a 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -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 @@ -29,47 +29,47 @@ interface TableDraw // support assign macro for shape objects SID_ASSIGNMACRO [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] - // Drawing geht von Basic aus gar nicht, darum alles mit Export = FALSE + // Drawing geht von Basic aus gar nicht, darum alles mit Export = FALSE - FID_DEFINE_NAME [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_DEFINE_COLROWNAMERANGES [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_SOLVE [ StateMethod = StateDisableItems; Export = FALSE; ] + FID_DEFINE_NAME [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_DEFINE_COLROWNAMERANGES [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_SOLVE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_OPENDLG_OPTSOLVER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_PIVOTTABLE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_TABOP [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_SPECIAL_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_DEFINE_DBNAME [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_CONSOLIDATE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ] - // andere: - SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ] - //! SID_STYLE_DESIGNER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ] - //! SID_OPENDLG_FUNCTION[ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_APPLY [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_NEW_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_PIVOTTABLE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_TABOP [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_SPECIAL_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_DEFINE_DBNAME [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_CONSOLIDATE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ] + // andere: + SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ] + //! SID_STYLE_DESIGNER [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ] + //! SID_OPENDLG_FUNCTION[ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_APPLY [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_NEW_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_UPDATE_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_NEW [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_DELETE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_NEW [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_DELETE [ StateMethod = StateDisableItems; Export = FALSE; ] //---------------------------------------------------------------------------- - SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] - SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] + SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] + SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] // ---- Slot-IDs fuer Objectbar: SID_COLOR_TABLE [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_GRADIENT_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_HATCH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_BITMAP_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_DASH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_LINEEND_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_GRADIENT_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_HATCH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_BITMAP_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_DASH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_LINEEND_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ] // Flaechen-Attribute - SID_ATTR_FILL_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_FILL_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] // #i25616# SID_ATTR_FILL_SHADOW @@ -79,61 +79,61 @@ interface TableDraw Export = FALSE; ] - SID_ATTR_FILL_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_FILL_GRADIENT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_FILL_HATCH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_FILL_BITMAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_FILL_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_FILL_GRADIENT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_FILL_HATCH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_FILL_BITMAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] // ---- Linien-Attribute: - SID_ATTR_LINE_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_LINEEND_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] - SID_ATTR_LINE_DASH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_LINE_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_LINE_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTRIBUTES_AREA [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] - SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] - SID_ATTR_TRANSFORM [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ATTR_LINE_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_LINEEND_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] + SID_ATTR_LINE_DASH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_LINE_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_LINE_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTRIBUTES_AREA [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] + SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ] + SID_ATTR_TRANSFORM [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ] // ---- Ausrichtungs - Funktionen: - //! PseudoSlots gibt Aerger mit Referenz-Dialogen ??? + //! PseudoSlots gibt Aerger mit Referenz-Dialogen ??? SID_OBJECT_ALIGN [ - // PseudoSlots = TRUE; + // PseudoSlots = TRUE; PseudoSlots = FALSE ; Export = FALSE ; - // PseudoPrefix = SID_OBJECT_ALIGN; + // PseudoPrefix = SID_OBJECT_ALIGN; ExecMethod = ExecDrawFunc ; StateMethod = NoState ; GroupId = GID_FORMAT ; FastCall , Cachable ; ToolBoxConfig ; ] - SID_OBJECT_ALIGN_LEFT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ALIGN_CENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ALIGN_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ALIGN_UP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ALIGN_MIDDLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ALIGN_DOWN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_LEFT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_CENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_UP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_MIDDLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ALIGN_DOWN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] // pseudo slots from Format menu SID_ALIGN_ANY_LEFT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ALIGN_ANY_TOP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ALIGN_ANY_TOP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_ALIGN_ANY_VCENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_ALIGN_ANY_BOTTOM [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] // ---- andere Funktionen: - SID_OBJECT_HEAVEN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_HELL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_FRAME_TO_TOP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_FRAME_TO_BOTTOM [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_FRAME_UP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_FRAME_DOWN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_UNGROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ENTER_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_LEAVE_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_HEAVEN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_HELL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_FRAME_TO_TOP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_FRAME_TO_BOTTOM [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_FRAME_UP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_FRAME_DOWN [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_UNGROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ENTER_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_LEAVE_GROUP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] // !!! special - SID_DELETE [ExecMethod = ExecDrawFunc ;StateMethod = GetDrawFuncState; Export = FALSE ;] + SID_DELETE [ExecMethod = ExecDrawFunc ;StateMethod = GetDrawFuncState; Export = FALSE ;] /* SfxVoidItem Delete SID_DELETE ( ) @@ -146,13 +146,13 @@ interface TableDraw ToolBoxConfig , MenuConfig , AccelConfig ; ] */ - SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_COPY [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_SELECTALL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_OBJECT_ROTATE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] - SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] - SID_BEZIER_EDIT [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_COPY [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_SELECTALL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_OBJECT_ROTATE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_BEZIER_EDIT [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_MIRROR_HORIZONTAL[ ExecMethod = ExecDrawFunc;StateMethod = GetDrawFuncState; Export = FALSE; ] /* SfxVoidItem ObjectMirrorHorizontal SID_MIRROR_HORIZONTAL ( ) @@ -164,66 +164,66 @@ interface TableDraw MenuConfig ; //FS ] */ - SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ANCHOR_PAGE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] - SID_ANCHOR_TOGGLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ANCHOR_CELL [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ANCHOR_PAGE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_ANCHOR_TOGGLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ANCHOR_CELL [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] // ---- FontWork: - SID_FONTWORK [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] - SID_FORMTEXT_STYLE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_ADJUST [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_DISTANCE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_START [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_MIRROR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_HIDEFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_OUTLINE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHADOW [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_ATTR_POSITION [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ATTR_SIZE [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_TABLE_CELL [ StateMethod = GetDrawAttrState; Export = FALSE; ] - SID_ORIGINALSIZE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_HYPERLINK_SETLINK [ ExecMethod = ExecuteHLink; Export = FALSE; ] - SID_HYPERLINK_GETLINK [ StateMethod = GetHLinkState; Export = FALSE; ] - SID_ENABLE_HYPHENATION [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_FONTWORK [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] + SID_FORMTEXT_STYLE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_ADJUST [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_DISTANCE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_START [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_MIRROR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_HIDEFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_OUTLINE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHADOW [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_ATTR_POSITION [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ATTR_SIZE [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_TABLE_CELL [ StateMethod = GetDrawAttrState; Export = FALSE; ] + SID_ORIGINALSIZE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_HYPERLINK_SETLINK [ ExecMethod = ExecuteHLink; Export = FALSE; ] + SID_HYPERLINK_GETLINK [ StateMethod = GetHLinkState; Export = FALSE; ] + SID_ENABLE_HYPHENATION [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] // #i68101# SID_TITLE_DESCRIPTION_OBJECT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_RENAME_OBJECT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_RENAME_OBJECT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_FORMATPAINTBRUSH [ ExecMethod = ExecFormatPaintbrush; StateMethod = StateFormatPaintbrush; ] - SID_OPEN_XML_FILTERSETTINGS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TOOGLE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TILT_DOWN [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TILT_UP [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TILT_LEFT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TILT_RIGHT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_DEPTH_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_DEPTH_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_OPEN_XML_FILTERSETTINGS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TOOGLE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TILT_DOWN [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TILT_UP [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TILT_LEFT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TILT_RIGHT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_DEPTH_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_DEPTH_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_DIRECTION_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_LIGHTING_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_SURFACE_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_3D_COLOR [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_DEPTH [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_DIRECTION [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_PROJECTION [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_LIGHTING_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_SURFACE_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_3D_COLOR [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_DEPTH [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_DIRECTION [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_PROJECTION [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_LIGHTING_DIRECTION[ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_LIGHTING_INTENSITY[ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_SURFACE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - - SID_FONTWORK_SHAPE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_SHAPE_TYPE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_ALIGNMENT_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_CHARACTER_SPACING_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_ALIGNMENT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_SAME_LETTER_HEIGHTS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_CHARACTER_SPACING [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_KERN_CHARACTER_PAIRS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_FONTWORK_CHARACTER_SPACING_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_SURFACE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + + SID_FONTWORK_SHAPE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_SHAPE_TYPE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_ALIGNMENT_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_CHARACTER_SPACING_FLOATER [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_ALIGNMENT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_SAME_LETTER_HEIGHTS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_CHARACTER_SPACING [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_KERN_CHARACTER_PAIRS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_FONTWORK_CHARACTER_SPACING_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] // ISSUE66550_HLINK_FOR_SHAPES // SID_DRAW_HLINK_EDIT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ] diff --git a/sc/sdi/drformsh.sdi b/sc/sdi/drformsh.sdi index f41842286992..f62eb53945f6 100644 --- a/sc/sdi/drformsh.sdi +++ b/sc/sdi/drformsh.sdi @@ -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/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index cad53257c136..487a6e8ed556 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -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 @@ -26,117 +26,117 @@ ************************************************************************/ interface TableDrawText { - // Drawing geht von Basic aus gar nicht, darum alles mit Export = FALSE + // Drawing geht von Basic aus gar nicht, darum alles mit Export = FALSE // alle Referenz-Eingabe-Dialoge: - FID_DEFINE_NAME [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_DEFINE_COLROWNAMERANGES [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_SOLVE [ StateMethod = StateDisableItems; Export = FALSE; ] + FID_DEFINE_NAME [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_DEFINE_COLROWNAMERANGES [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_SOLVE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_OPENDLG_OPTSOLVER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_PIVOTTABLE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_TABOP [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_SPECIAL_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_DEFINE_DBNAME [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_CONSOLIDATE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ] - // andere: - SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_OPENDLG_FUNCTION [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_APPLY [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_NEW_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_PIVOTTABLE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_TABOP [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_SPECIAL_FILTER [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_DEFINE_DBNAME [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_CONSOLIDATE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ] + // andere: + SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_OPENDLG_FUNCTION [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_APPLY [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_NEW_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_UPDATE_BY_EXAMPLE [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_NEW [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export = FALSE; ] - SID_STYLE_DELETE [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_NEW [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export = FALSE; ] + SID_STYLE_DELETE [ StateMethod = StateDisableItems; Export = FALSE; ] //---------------------------------------------------------------------------- - SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_COPY [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PASTE [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] + SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_COPY [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PASTE [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_PASTE_SPECIAL [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] - SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THES [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THESAURUS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] // Attribute: -------------------------------------------------- - SID_TEXT_STANDARD [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ] - SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ] - SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_TEXT_STANDARD [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ] + SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ] + SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_NONE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_NONE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGNLEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGNCENTERHOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGNRIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGNBLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_PARA_LINESPACE_10 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_PARA_LINESPACE_15 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_PARA_LINESPACE_20 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_CHAR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_PARA_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGNLEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGNCENTERHOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGNRIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGNBLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_PARA_LINESPACE_10 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_PARA_LINESPACE_15 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_PARA_LINESPACE_20 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_CHAR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_PARA_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] // ---- FontWork: - SID_FONTWORK [ ExecMethod = ExecuteExtra; StateMethod = GetState; Export = FALSE; ] + SID_FONTWORK [ ExecMethod = ExecuteExtra; StateMethod = GetState; Export = FALSE; ] // pseudo slots from Format menu SID_ALIGN_ANY_LEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ALIGN_ANY_JUSTIFIED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_FORMTEXT_STYLE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_ADJUST [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_DISTANCE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_START [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_MIRROR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_HIDEFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_OUTLINE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHADOW [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_STYLE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_ADJUST [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_DISTANCE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_START [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_MIRROR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_HIDEFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_OUTLINE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHADOW [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] + SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ] - SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ] - SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] + SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ] + SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] SID_OPEN_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_TEXTDIRECTION_LEFT_TO_RIGHT [ ExecMethod = Execute; StateMethod = GetAttrState; Export = FALSE; ] - SID_TEXTDIRECTION_TOP_TO_BOTTOM [ ExecMethod = Execute; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_PARA_LEFT_TO_RIGHT [ ExecMethod = ExecuteExtra; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_PARA_RIGHT_TO_LEFT [ ExecMethod = ExecuteExtra; StateMethod = GetAttrState; Export = FALSE; ] + SID_TEXTDIRECTION_LEFT_TO_RIGHT [ ExecMethod = Execute; StateMethod = GetAttrState; Export = FALSE; ] + SID_TEXTDIRECTION_TOP_TO_BOTTOM [ ExecMethod = Execute; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_PARA_LEFT_TO_RIGHT [ ExecMethod = ExecuteExtra; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_PARA_RIGHT_TO_LEFT [ ExecMethod = ExecuteExtra; StateMethod = GetAttrState; Export = FALSE; ] SID_VERTICALTEXT_STATE [ StateMethod = GetAttrState ; Export = FALSE; ] SID_CTLFONT_STATE [ StateMethod = GetAttrState ; Export = FALSE; ] SID_TRANSLITERATE_SENTENCE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_TITLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_TOGGLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_UPPER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_UPPER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] } diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 1d95f2debdc3..21e466ac3b1a 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -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 @@ -26,9 +26,9 @@ ************************************************************************/ interface TableText { - // von Basic aus nicht erreichbar, darum alles mit Export = FALSE + // von Basic aus nicht erreichbar, darum alles mit Export = FALSE - SID_ATTR_INSERT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_ATTR_INSERT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_DELETE [ @@ -38,58 +38,58 @@ interface TableText GroupId = GID_EDIT ; Cachable ; ] - SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_COPY [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PASTE [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] + SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_COPY [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PASTE [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_PASTE_SPECIAL [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] - SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - FID_INSERT_NAME [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + FID_INSERT_NAME [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THES [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_UNDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] - SID_REDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] - SID_REPEAT [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] + SID_UNDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] + SID_REDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] + SID_REPEAT [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; Export = FALSE; ] // ---- Attribute: - SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] // ---- Attribut - Toggles: - SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_NONE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_NONE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] - SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_CHAR_DLG [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_TOGGLE_REL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_CHAR_DLG [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_TOGGLE_REL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ] - SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] + SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ] + SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] SID_OPEN_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_SENTENCE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_TITLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_TOGGLE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_UPPER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_LOWER [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] FN_INSERT_SOFT_HYPHEN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] FN_INSERT_HARDHYPHEN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 31ccf5c8af84..1ea04c752822 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -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 @@ -31,16 +31,16 @@ interface TableFont uuid ( "2E4AC1C0-137C-11D3-B25B-006097DA68F3" ) ] { - SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ULINE_VAL_NONE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ULINE_VAL_NONE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ULINE_VAL_SINGLE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] } // =========================================================================== @@ -58,15 +58,15 @@ interface FormatForSelection ] // Slot's die in der DrawShell disabled werden. { - SID_STYLE_FAMILY2 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_APPLY [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_WATERCAN [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_NEW_BY_EXAMPLE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_UPDATE_BY_EXAMPLE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_NEW [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_FAMILY4 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_EDIT [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] - SID_STYLE_DELETE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_FAMILY2 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_APPLY [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_WATERCAN [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_NEW_BY_EXAMPLE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_UPDATE_BY_EXAMPLE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_NEW [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_FAMILY4 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_EDIT [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] + SID_STYLE_DELETE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] // } Slot's die in der DrawShell disabled werden. SID_ATTR_ALIGN_HOR_JUSTIFY [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ] @@ -79,33 +79,33 @@ interface FormatForSelection // pseudo slots from Format menu SID_ALIGN_ANY_LEFT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_JUSTIFIED [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_ALIGN_ANY_TOP [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_TOP [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_VCENTER [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_BOTTOM [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_ALIGN_ANY_HDEFAULT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_ALIGN_ANY_VDEFAULT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_HDEFAULT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_VDEFAULT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_SCATTR_PROTECTION [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_BACKGROUND_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_BRUSH [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_RELIEF [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_ALIGNLEFT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNRIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNTOP [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNBOTTOM [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNCENTERVER [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNBLOCK [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_ALIGNCENTERHOR [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNLEFT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNRIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNTOP [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNBOTTOM [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNCENTERVER [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNBLOCK [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] + SID_ALIGNCENTERHOR [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] - SID_V_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] - SID_H_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_V_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_H_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_TEXTDIRECTION_LEFT_TO_RIGHT [ ExecMethod = ExecuteTextDirection; StateMethod = GetTextDirectionState; ] SID_TEXTDIRECTION_TOP_TO_BOTTOM [ ExecMethod = ExecuteTextDirection; StateMethod = GetTextDirectionState; ] @@ -116,23 +116,23 @@ interface FormatForSelection SID_ATTR_NUMBERFORMAT_VALUE [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;] SID_NUMBER_FORMAT [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;] - SID_NUMBER_TWODEC [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_SCIENTIFIC [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_DATE [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_TWODEC [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_SCIENTIFIC [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_DATE [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;] - SID_ATTR_BORDER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] //XXX - SID_ATTR_BORDER_INNER [ StateMethod = GetBorderState; ] // status() + SID_ATTR_BORDER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] //XXX + SID_ATTR_BORDER_INNER [ StateMethod = GetBorderState; ] // status() SID_ATTR_BORDER_OUTER [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ] SID_ATTR_BORDER_SHADOW [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ] - SID_ATTR_ALIGN_LINEBREAK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_FRAME_LINESTYLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] - SID_FRAME_LINECOLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_ALIGN_LINEBREAK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_FRAME_LINESTYLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_FRAME_LINECOLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_FORMATPAINTBRUSH [ ExecMethod = ExecFormatPaintbrush; StateMethod = StateFormatPaintbrush; ] } @@ -142,7 +142,7 @@ interface FormatForSelection shell ScFormatShell { import FormatForSelection[Automation]; -// import Interior ".Interior"; +// import Interior ".Interior"; import TableFont ".Font"; } diff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdi index 4dac1dca12c1..9cf6348b834d 100644 --- a/sc/sdi/graphsh.sdi +++ b/sc/sdi/graphsh.sdi @@ -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,7 +27,7 @@ interface GraphSelection { - // filters + // filters SID_GRFFILTER [ diff --git a/sc/sdi/mediash.sdi b/sc/sdi/mediash.sdi index 0f0b5297db1c..dbf89a816e48 100644 --- a/sc/sdi/mediash.sdi +++ b/sc/sdi/mediash.sdi @@ -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/sc/sdi/oleobjsh.sdi b/sc/sdi/oleobjsh.sdi index e77d219fd694..509c5a8ad985 100644 --- a/sc/sdi/oleobjsh.sdi +++ b/sc/sdi/oleobjsh.sdi @@ -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/sc/sdi/pgbrksh.sdi b/sc/sdi/pgbrksh.sdi index c776c98b9d59..173348d2c2d7 100644 --- a/sc/sdi/pgbrksh.sdi +++ b/sc/sdi/pgbrksh.sdi @@ -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/sc/sdi/pivotsh.sdi b/sc/sdi/pivotsh.sdi index d763aa8c995a..4b2ddbef157e 100644 --- a/sc/sdi/pivotsh.sdi +++ b/sc/sdi/pivotsh.sdi @@ -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 @@ -26,10 +26,10 @@ ************************************************************************/ interface Pivot { - // von Basic aus nicht erreichbar, darum alles mit Export = FALSE + // von Basic aus nicht erreichbar, darum alles mit Export = FALSE - SID_PIVOT_RECALC [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PIVOT_KILL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PIVOT_RECALC [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PIVOT_KILL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_DP_FILTER [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] } diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi index 2af8e07a117b..117472759c26 100644 --- a/sc/sdi/prevwsh.sdi +++ b/sc/sdi/prevwsh.sdi @@ -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 @@ -26,18 +26,18 @@ ************************************************************************/ interface TablePrintPreview { - // von Basic aus nicht erreichbar, darum alles mit Export = FALSE + // von Basic aus nicht erreichbar, darum alles mit Export = FALSE - SID_FORMATPAGE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_STATUS_PAGESTYLE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_HFEDIT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_ATTR_ZOOM [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - FID_SCALE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_STATUS_DOCPOS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PREVIEW_NEXT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PREVIEW_PREVIOUS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PREVIEW_FIRST [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PREVIEW_LAST [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_FORMATPAGE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_STATUS_PAGESTYLE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_HFEDIT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_ATTR_ZOOM [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + FID_SCALE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_STATUS_DOCPOS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_NEXT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_PREVIOUS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_FIRST [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_LAST [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_PREVIEW_MARGIN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_PREVIEW_SCALINGFACTOR [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_ATTR_ZOOMSLIDER [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] @@ -66,8 +66,8 @@ interface TablePrintPreview Cachable ; ] - SID_CURSORHOME [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_CURSOREND [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_CURSORHOME [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_CURSOREND [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SfxVoidItem GoDown SID_CURSORDOWN ( @@ -150,14 +150,14 @@ interface TablePrintPreview GroupId = GID_INTERN ; Cachable ; ] - SID_PREVIEW_ZOOMIN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PREVIEW_ZOOMOUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_REPAINT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_UNDO [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_REDO [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_REPEAT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] - SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] // ole() api() - SID_PREVIEW_CLOSE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_ZOOMIN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PREVIEW_ZOOMOUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_REPAINT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_UNDO [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_REDO [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_REPEAT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] // ole() api() + SID_PREVIEW_CLOSE [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_CANCEL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] } diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 1e42ce5fb1dc..b46c5692aa78 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -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 @@ -7365,7 +7365,7 @@ SfxBoolItem ViewRowColumnHeaders FID_TOGGLEHEADERS ] //-------------------------------------------------------------------------- -SfxBoolItem ToggleFormula FID_TOGGLEFORMULA +SfxBoolItem ToggleFormula FID_TOGGLEFORMULA [ /* flags */ @@ -7778,7 +7778,7 @@ SfxVoidItem ShareDocument SID_SHARE_DOC SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR [ - // flags: + // flags: AutoUpdate = FALSE, Cachable = Cachable, FastCall = FALSE, @@ -7793,7 +7793,7 @@ SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR Readonly = FALSE, - // config: + // config: AccelConfig = TRUE, MenuConfig = TRUE, StatusBarConfig = FALSE, diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc index 6a7d3a3f7459..10d1675f5ba1 100644 --- a/sc/sdi/scslots.hrc +++ b/sc/sdi/scslots.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 diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi index 3b3f1ad57295..b4cbecd9cbbf 100644 --- a/sc/sdi/scslots.sdi +++ b/sc/sdi/scslots.sdi @@ -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/sc/sdi/tabpopsh.sdi b/sc/sdi/tabpopsh.sdi index cdf7d108bbe7..1d5b5331ee17 100644 --- a/sc/sdi/tabpopsh.sdi +++ b/sc/sdi/tabpopsh.sdi @@ -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 @@ -26,6 +26,6 @@ ************************************************************************/ shell ScTabPopShell { - // nix drin + // nix drin } diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index fac67839e656..08cfebf18094 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -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,15 +32,15 @@ interface TableOLEObject uuid ( "C04AA960-137B-11D3-B25B-006097DA68F3" ) ] { - SID_ACTIVE_OBJ_NAME [ StateMethod = GetObjectState; ] - SID_OLE_OBJECT [ StateMethod = GetObjectState; ] - SID_OLE_ACTIVATE [ ExecMethod = ExecuteObject; ] - SID_OLE_DEACTIVATE [ ExecMethod = ExecuteObject; ] - SID_OLE_SELECT [ ExecMethod = ExecuteObject; ] // api: - SID_OBJECT_LEFT [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] - SID_OBJECT_TOP [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] - SID_OBJECT_WIDTH [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] - SID_OBJECT_HEIGHT [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] + SID_ACTIVE_OBJ_NAME [ StateMethod = GetObjectState; ] + SID_OLE_OBJECT [ StateMethod = GetObjectState; ] + SID_OLE_ACTIVATE [ ExecMethod = ExecuteObject; ] + SID_OLE_DEACTIVATE [ ExecMethod = ExecuteObject; ] + SID_OLE_SELECT [ ExecMethod = ExecuteObject; ] // api: + SID_OBJECT_LEFT [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] + SID_OBJECT_TOP [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] + SID_OBJECT_WIDTH [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] + SID_OBJECT_HEIGHT [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] } //============================================================================ @@ -49,14 +49,14 @@ interface Tables uuid = "5692EFC0-355B-11cf-89CB-008029E4B0B1" ; ] { - FID_TAB_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] + FID_TAB_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] FID_TAB_DESELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] - FID_TAB_MENU_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_APPEND [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_INS_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_INS_TABLE_EXT [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TABLE_HIDE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TABLE_SHOW [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_MENU_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_APPEND [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_INS_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_INS_TABLE_EXT [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TABLE_HIDE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TABLE_SHOW [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] SID_SELECT_TABLES [ ExecMethod = Execute; StateMethod = GetState; ] FID_TAB_MENU_SET_TAB_BG_COLOR [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] FID_TAB_EVENTS [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] @@ -70,18 +70,18 @@ interface BaseSelection { // Einfuegen von Objekten { - SID_INSERT_GRAPHIC [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_FRAME [ ExecMethod = ExecDraw; StateMethod = GetDrawState; Export = FALSE; ] - SID_INSERT_OBJECT [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_PLUGIN [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_SOUND [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_VIDEO [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_APPLET [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_FLOATINGFRAME [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_AVMEDIA [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_GRAPHIC [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_FRAME [ ExecMethod = ExecDraw; StateMethod = GetDrawState; Export = FALSE; ] + SID_INSERT_OBJECT [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_PLUGIN [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_SOUND [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_VIDEO [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_APPLET [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_FLOATINGFRAME [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_INSERT_AVMEDIA [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_IMAP [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ] - SID_IMAP_EXEC [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ] + SID_IMAP [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ] + SID_IMAP_EXEC [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ] SfxVoidItem InsertObjectChart SID_INSERT_DIAGRAM ( @@ -96,33 +96,33 @@ interface BaseSelection Cachable , Asynchron ; ] - SID_PIVOT_CREATE [ ExecMethod = ExecuteSbx; StateMethod = GetSbxState; ] - SID_RANGE_OFFSET [ ExecMethod = ExecuteSbx; ] - SID_RANGE_REGION [ StateMethod = GetSbxState; ] - - - SID_INSERT_SMATH [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_GALLERY_FORMATS [ ExecMethod = ExecGallery; StateMethod = GetGalleryState; ] - SID_GALLERY [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ] - SID_AVMEDIA_PLAYER [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ] - SID_DRAW_NOTEEDIT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_OBJECTRESIZE [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - - //SID_CHOOSE_CONTROLS [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_OBJECT_SELECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_INSERT_DRAW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_FONTWORK_GALLERY_FLOATER [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_DRAWTBX_CS_BASIC [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAWTBX_CS_SYMBOL [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAWTBX_CS_ARROW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAWTBX_CS_FLOWCHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAWTBX_CS_CALLOUT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAWTBX_CS_STAR [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - SID_DRAW_CS_ID [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] - - SID_FM_CREATE_CONTROL [ ExecMethod = ExecDraw ; ] - SID_LINKS [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_DRAW_CHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_PIVOT_CREATE [ ExecMethod = ExecuteSbx; StateMethod = GetSbxState; ] + SID_RANGE_OFFSET [ ExecMethod = ExecuteSbx; ] + SID_RANGE_REGION [ StateMethod = GetSbxState; ] + + + SID_INSERT_SMATH [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_GALLERY_FORMATS [ ExecMethod = ExecGallery; StateMethod = GetGalleryState; ] + SID_GALLERY [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ] + SID_AVMEDIA_PLAYER [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ] + SID_DRAW_NOTEEDIT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_OBJECTRESIZE [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + + //SID_CHOOSE_CONTROLS [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_OBJECT_SELECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_INSERT_DRAW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_FONTWORK_GALLERY_FLOATER [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_DRAWTBX_CS_BASIC [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAWTBX_CS_SYMBOL [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAWTBX_CS_ARROW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAWTBX_CS_FLOWCHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAWTBX_CS_CALLOUT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAWTBX_CS_STAR [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + SID_DRAW_CS_ID [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] + + SID_FM_CREATE_CONTROL [ ExecMethod = ExecDraw ; ] + SID_LINKS [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] + SID_DRAW_CHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_FM_CREATE_FIELDCONTROL [ ExecMethod = ExecDrawIns ; ] // } Einfuegen von Objekten @@ -147,14 +147,14 @@ interface TableEditView Export = FALSE ; ] - FID_TOGGLEINPUTLINE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_DEFINE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] - SID_ADD_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] - FID_ADJUST_PRINTZOOM [ ExecMethod = Execute; StateMethod = GetState; ] + FID_TOGGLEINPUTLINE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_DEFINE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] + SID_ADD_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] + FID_ADJUST_PRINTZOOM [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CURRENTDOC [ ExecMethod = Execute; StateMethod = GetState; ] - SID_WINDOW_SPLIT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_WINDOW_FIX [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CURRENTDOC [ ExecMethod = Execute; StateMethod = GetState; ] + SID_WINDOW_SPLIT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_WINDOW_FIX [ ExecMethod = Execute; StateMethod = GetState; ] SID_SAVEDOC [ ExecMethod = ExecuteSave ; @@ -167,66 +167,66 @@ interface TableEditView StateMethod = GetSaveState ; Export = FALSE ; ] - // hat zwar ein SW im Namen, wird aber im Calc auch gebraucht + // hat zwar ein SW im Namen, wird aber im Calc auch gebraucht SID_CREATE_SW_DRAWVIEW [ ExecMethod = Execute; ] - SID_ATTR_ZOOM [ ExecMethod = Execute; StateMethod = GetState; ] + SID_ATTR_ZOOM [ ExecMethod = Execute; StateMethod = GetState; ] SID_ATTR_ZOOMSLIDER [ ExecMethod = Execute; StateMethod = GetState; ] - FID_INSERT_FILE [ ExecMethod = Execute; StateMethod = GetState; ] - // Save / SaveAs ueberladen, um die Eingabe abzuschliessen + FID_INSERT_FILE [ ExecMethod = Execute; StateMethod = GetState; ] + // Save / SaveAs ueberladen, um die Eingabe abzuschliessen - FID_SCALE [ ExecMethod = Execute; StateMethod = GetState; ] - FID_FUNCTION_BOX [ ExecMethod = Execute; StateMethod = GetState; ] - FID_CHG_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] - WID_SIMPLE_REF [ ExecMethod = Execute; StateMethod = NoState; ] - FID_CHG_ACCEPT [ ExecMethod = Execute; StateMethod = GetState; ] - FID_CHG_COMMENT [ ExecMethod = Execute; StateMethod = GetState; ] + FID_SCALE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_FUNCTION_BOX [ ExecMethod = Execute; StateMethod = GetState; ] + FID_CHG_SHOW [ ExecMethod = Execute; StateMethod = GetState; ] + WID_SIMPLE_REF [ ExecMethod = Execute; StateMethod = NoState; ] + FID_CHG_ACCEPT [ ExecMethod = Execute; StateMethod = GetState; ] + FID_CHG_COMMENT [ ExecMethod = Execute; StateMethod = GetState; ] - FID_SCALESTATUS [ ExecMethod = Execute; StateMethod = GetState; ] + FID_SCALESTATUS [ ExecMethod = Execute; StateMethod = GetState; ] FID_TOGGLESYNTAX [ ExecMethod = Execute; StateMethod = GetState; ] - FID_TOGGLEHEADERS [ ExecMethod = Execute; StateMethod = GetState; ] - FID_TOGGLEFORMULA [ ExecMethod = Execute; StateMethod = GetState; ] - FID_NORMALVIEWMODE [ ExecMethod = Execute; StateMethod = GetState; ] - FID_PAGEBREAKMODE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_REPAINT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CURRENTCELL [ ExecMethod = Execute; StateMethod = GetState; ] - SID_CURRENTOBJECT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_JUMPTOMARK [ ExecMethod = Execute; StateMethod = NoState; ] // status(final|play) - - SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; ] - - - // Suchen/Eersetzen: - FID_SEARCH_NOW [ ExecMethod = ExecSearch; StateMethod = NoState; ] - SID_SEARCH_ITEM [ ExecMethod = ExecSearch; StateMethod = GetState; ] - SID_SEARCH_OPTIONS [ ExecMethod = NoExec; StateMethod = GetState; ] - // Suchen/Ersetzen von Basic aus: - FID_SEARCH [ ExecMethod = ExecSearch; ] - FID_REPLACE [ ExecMethod = ExecSearch; ] - FID_SEARCH_ALL [ ExecMethod = ExecSearch; ] - FID_REPLACE_ALL [ ExecMethod = ExecSearch; ] - FID_REPEAT_SEARCH [ ExecMethod = ExecSearch; ] - - SID_CURRENTTAB [ ExecMethod = Execute; StateMethod = GetState; ] - - // view options for drawing layer are needed here because they - // can be set without a drawing object selected (#75361#) - SID_GRID_VISIBLE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] - SID_GRID_USE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] - SID_HELPLINES_MOVE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] - - SID_GETUNDOSTRINGS [ StateMethod = GetUndoState; ] - SID_GETREDOSTRINGS [ StateMethod = GetUndoState; ] - SID_UNDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; ] - SID_REDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; ] + FID_TOGGLEHEADERS [ ExecMethod = Execute; StateMethod = GetState; ] + FID_TOGGLEFORMULA [ ExecMethod = Execute; StateMethod = GetState; ] + FID_NORMALVIEWMODE [ ExecMethod = Execute; StateMethod = GetState; ] + FID_PAGEBREAKMODE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_REPAINT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CURRENTCELL [ ExecMethod = Execute; StateMethod = GetState; ] + SID_CURRENTOBJECT [ ExecMethod = Execute; StateMethod = GetState; ] + SID_JUMPTOMARK [ ExecMethod = Execute; StateMethod = NoState; ] // status(final|play) + + SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; ] + + + // Suchen/Eersetzen: + FID_SEARCH_NOW [ ExecMethod = ExecSearch; StateMethod = NoState; ] + SID_SEARCH_ITEM [ ExecMethod = ExecSearch; StateMethod = GetState; ] + SID_SEARCH_OPTIONS [ ExecMethod = NoExec; StateMethod = GetState; ] + // Suchen/Ersetzen von Basic aus: + FID_SEARCH [ ExecMethod = ExecSearch; ] + FID_REPLACE [ ExecMethod = ExecSearch; ] + FID_SEARCH_ALL [ ExecMethod = ExecSearch; ] + FID_REPLACE_ALL [ ExecMethod = ExecSearch; ] + FID_REPEAT_SEARCH [ ExecMethod = ExecSearch; ] + + SID_CURRENTTAB [ ExecMethod = Execute; StateMethod = GetState; ] + + // view options for drawing layer are needed here because they + // can be set without a drawing object selected (#75361#) + SID_GRID_VISIBLE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] + SID_GRID_USE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] + SID_HELPLINES_MOVE [ ExecMethod = ExecDrawOpt; StateMethod = GetDrawOptState; Export = FALSE; ] + + SID_GETUNDOSTRINGS [ StateMethod = GetUndoState; ] + SID_GETREDOSTRINGS [ StateMethod = GetUndoState; ] + SID_UNDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; ] + SID_REDO [ ExecMethod = ExecuteUndo; StateMethod = GetUndoState; ] SID_OPT_LOCALE_CHANGED [ ExecMethod = Execute; ] - SID_READONLY_MODE [ StateMethod = GetState; ] + SID_READONLY_MODE [ StateMethod = GetState; ] } // - // Pivot-Krempel + // Pivot-Krempel // interface DataPilotTables @@ -273,13 +273,13 @@ shell ScTabViewShell import Tables "ActiveDocument.Tables"; import BaseSelection; import TableEditView[Automation]; -// import SearchSettings; +// import SearchSettings; - SID_STATUS_PAGESTYLE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_TBXCTL_INSERT [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] - SID_TBXCTL_INSCELLS [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] - SID_TBXCTL_INSOBJ [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] + SID_STATUS_PAGESTYLE [ ExecMethod = Execute; StateMethod = GetState; ] + SID_TBXCTL_INSERT [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] + SID_TBXCTL_INSCELLS [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] + SID_TBXCTL_INSOBJ [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ] } diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index f3443312bd4e..79eb1be8db4a 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -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 @@ -77,7 +77,7 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : if (pData) { pData[0].nRow = MAXROW; - pData[0].pPattern = pDocument->GetDefPattern(); // ohne Put !!! + pData[0].pPattern = pDocument->GetDefPattern(); // ohne Put !!! } } @@ -135,10 +135,10 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc ) { if (pData) { - ScDocumentPool* pDocPool = pDocument->GetPool(); + ScDocumentPool* pDocPool = pDocument->GetPool(); const ScPatternAttr* pOldPattern; - ScAddress aAdrStart( nCol, 0, nTab ); - ScAddress aAdrEnd ( nCol, 0, nTab ); + ScAddress aAdrStart( nCol, 0, nTab ); + ScAddress aAdrEnd ( nCol, 0, nTab ); for (SCSIZE i=0; i(nCount) - 1; - long nStartRow = 0; - long nEndRow = 0; - long i = 0; - BOOL bFound = (nCount == 1); + long nLo = 0; + long nHi = static_cast(nCount) - 1; + long nStartRow = 0; + long nEndRow = 0; + long i = 0; + BOOL bFound = (nCount == 1); if (pData) { while ( !bFound && nLo <= nHi ) @@ -477,7 +477,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern pDocument->SetStreamValid(nTab, FALSE); } } -// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute(); +// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute(); #ifdef DBG_UTIL TestData(); @@ -566,19 +566,19 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* // const wird weggecastet, weil es sonst // zu ineffizient/kompliziert wird! -#define SET_LINECOLOR(dest,c) \ - if ((dest)) \ - { \ - ((SvxBorderLine*)(dest))->SetColor((c)); \ +#define SET_LINECOLOR(dest,c) \ + if ((dest)) \ + { \ + ((SvxBorderLine*)(dest))->SetColor((c)); \ } -#define SET_LINE(dest,src) \ - if ((dest)) \ - { \ - SvxBorderLine* pCast = (SvxBorderLine*)(dest); \ - pCast->SetOutWidth((src)->GetOutWidth()); \ - pCast->SetInWidth ((src)->GetInWidth()); \ - pCast->SetDistance((src)->GetDistance()); \ +#define SET_LINE(dest,src) \ + if ((dest)) \ + { \ + SvxBorderLine* pCast = (SvxBorderLine*)(dest); \ + pCast->SetOutWidth((src)->GetOutWidth()); \ + pCast->SetInWidth ((src)->GetInWidth()); \ + pCast->SetDistance((src)->GetDistance()); \ } void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, @@ -599,7 +599,7 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, do { - const ScPatternAttr* pOldPattern = pData[nPos].pPattern; + const ScPatternAttr* pOldPattern = pData[nPos].pPattern; const SfxItemSet& rOldSet = pOldPattern->GetItemSet(); const SfxPoolItem* pBoxItem = 0; SfxItemState eState = rOldSet.GetItemState( ATTR_BORDER, TRUE, &pBoxItem ); @@ -610,10 +610,10 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, if ( (SFX_ITEM_SET == eState) || (SFX_ITEM_SET == eTLBRState) || (SFX_ITEM_SET == eBLTRState) ) { - ScPatternAttr* pNewPattern = new ScPatternAttr(*pOldPattern); + ScPatternAttr* pNewPattern = new ScPatternAttr(*pOldPattern); SfxItemSet& rNewSet = pNewPattern->GetItemSet(); - SCROW nY1 = nStart; - SCROW nY2 = pData[nPos].nRow; + SCROW nY1 = nStart; + SCROW nY2 = pData[nPos].nRow; SvxBoxItem* pNewBoxItem = pBoxItem ? (SvxBoxItem*)pBoxItem->Clone() : 0; SvxLineItem* pNewTLBRItem = pTLBRItem ? (SvxLineItem*)pTLBRItem->Clone() : 0; @@ -789,7 +789,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac else { //!!!!!!!!!!!!!!!!!! mit diesem Remove gibt es Abstuerze (Calc1 Import) -//! pDocument->GetPool()->Remove(*pNewPattern); +//! pDocument->GetPool()->Remove(*pNewPattern); nStart = pData[nPos].nRow + 1; ++nPos; } @@ -812,10 +812,10 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) const SfxPoolItem* pOldItem; for (USHORT nId=ATTR_PATTERN_START; nId<=ATTR_PATTERN_END; nId++) { - // pMergeSet hat keinen Parent + // pMergeSet hat keinen Parent SfxItemState eOldState = rMergeSet.GetItemState( nId, FALSE, &pOldItem ); - if ( eOldState == SFX_ITEM_DEFAULT ) // Default + if ( eOldState == SFX_ITEM_DEFAULT ) // Default { SfxItemState eNewState = rSource.GetItemState( nId, TRUE, &pNewItem ); if ( eNewState == SFX_ITEM_SET ) @@ -824,21 +824,21 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) rMergeSet.InvalidateItem( nId ); } } - else if ( eOldState == SFX_ITEM_SET ) // Item gesetzt + else if ( eOldState == SFX_ITEM_SET ) // Item gesetzt { SfxItemState eNewState = rSource.GetItemState( nId, TRUE, &pNewItem ); if ( eNewState == SFX_ITEM_SET ) { - if ( pNewItem != pOldItem ) // beide gepuhlt + if ( pNewItem != pOldItem ) // beide gepuhlt rMergeSet.InvalidateItem( nId ); } - else // Default + else // Default { if ( *pOldItem != rSource.GetPool()->GetDefaultItem(nId) ) rMergeSet.InvalidateItem( nId ); } } - // Dontcare bleibt Dontcare + // Dontcare bleibt Dontcare } } @@ -858,7 +858,7 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, do { - // gleiche Patterns muessen nicht mehrfach angesehen werden + // gleiche Patterns muessen nicht mehrfach angesehen werden const ScPatternAttr* pPattern = pData[nPos].pPattern; if ( pPattern != rState.pOld1 && pPattern != rState.pOld2 ) @@ -866,8 +866,8 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, const SfxItemSet& rThisSet = pPattern->GetItemSet(); if (rState.pItemSet) { - // (*ppSet)->MergeValues( rThisSet, FALSE ); - // geht nicht, weil die Vorlagen nicht beruecksichtigt werden + // (*ppSet)->MergeValues( rThisSet, FALSE ); + // geht nicht, weil die Vorlagen nicht beruecksichtigt werden if (bDeep) lcl_MergeDeep( *rState.pItemSet, rThisSet ); @@ -876,7 +876,7 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, } else { - // erstes Pattern - in Set ohne Parent kopieren + // erstes Pattern - in Set ohne Parent kopieren rState.pItemSet = new SfxItemSet( *rThisSet.GetPool(), rThisSet.GetRanges() ); rState.pItemSet->Set( rThisSet, bDeep ); } @@ -894,19 +894,19 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, -// Umrandung zusammenbauen +// Umrandung zusammenbauen BOOL lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, BYTE& rModified, const SvxBorderLine*& rpNew ) { if (rModified == SC_LINE_DONTCARE) - return FALSE; // weiter geht's nicht + return FALSE; // weiter geht's nicht if (rModified == SC_LINE_EMPTY) { rModified = SC_LINE_SET; rpNew = pNewLine; - return TRUE; // zum ersten mal gesetzt + return TRUE; // zum ersten mal gesetzt } if (pOldLine == pNewLine) @@ -924,7 +924,7 @@ BOOL lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, rModified = SC_LINE_DONTCARE; rpNew = NULL; - return TRUE; // andere Linie -> dontcare + return TRUE; // andere Linie -> dontcare } @@ -932,7 +932,7 @@ void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, const ScPatternAttr* pPattern, BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ) { - // rechten/unteren Rahmen setzen, wenn Zelle bis zum Ende zusammengefasst: + // rechten/unteren Rahmen setzen, wenn Zelle bis zum Ende zusammengefasst: const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); if ( rMerge.GetColMerge() == nDistRight + 1 ) nDistRight = 0; @@ -940,9 +940,9 @@ void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, nDistBottom = 0; const SvxBoxItem* pCellFrame = (SvxBoxItem*) &pPattern->GetItemSet().Get( ATTR_BORDER ); - const SvxBorderLine* pLeftAttr = pCellFrame->GetLeft(); - const SvxBorderLine* pRightAttr = pCellFrame->GetRight(); - const SvxBorderLine* pTopAttr = pCellFrame->GetTop(); + const SvxBorderLine* pLeftAttr = pCellFrame->GetLeft(); + const SvxBorderLine* pRightAttr = pCellFrame->GetRight(); + const SvxBorderLine* pTopAttr = pCellFrame->GetTop(); const SvxBorderLine* pBottomAttr = pCellFrame->GetBottom(); const SvxBorderLine* pNew; @@ -1027,13 +1027,13 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine } // -// Rahmen anwenden +// Rahmen anwenden // -// ApplyFrame - auf einen Eintrag im Array +// ApplyFrame - auf einen Eintrag im Array -BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, +BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ) @@ -1044,7 +1044,7 @@ BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, const SvxBoxItem* pOldFrame = (const SvxBoxItem*) &pPattern->GetItemSet().Get( ATTR_BORDER ); - // rechten/unteren Rahmen setzen, wenn Zelle bis zum Ende zusammengefasst: + // rechten/unteren Rahmen setzen, wenn Zelle bis zum Ende zusammengefasst: const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); if ( rMerge.GetColMerge() == nDistRight + 1 ) nDistRight = 0; @@ -1076,7 +1076,7 @@ BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, SfxItemPoolCache aCache( pDocument->GetPool(), &aNewFrame ); ApplyCacheArea( nStartRow, nEndRow, &aCache ); -/* ScPatternAttr* pNewPattern = (ScPatternAttr*) pPattern->Clone(); +/* ScPatternAttr* pNewPattern = (ScPatternAttr*) pPattern->Clone(); pNewPattern->GetItemSet().Put( aNewFrame ); SetPatternArea( nStartRow, nEndRow, pNewPattern, TRUE ); */ @@ -1095,7 +1095,7 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf ApplyFrame( pLineOuter, pLineInner, nStartRow, nStartRow, bLeft, nDistRight, TRUE, nEndRow-nStartRow ); - if ( nEndRow > nStartRow+1 ) // innerer Teil vorhanden? + if ( nEndRow > nStartRow+1 ) // innerer Teil vorhanden? { SCSIZE nStartIndex; SCSIZE nEndIndex; @@ -1126,8 +1126,8 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf long lcl_LineSize( const SvxBorderLine& rLine ) { - // nur eine Linie -> halbe Breite, min. 20 - // doppelte Linie -> halber Abstand + eine Linie (je min. 20) + // nur eine Linie -> halbe Breite, min. 20 + // doppelte Linie -> halber Abstand + eine Linie (je min. 20) long nTotal = 0; USHORT nWidth = Max( rLine.GetOutWidth(), rLine.GetInWidth() ); @@ -1137,15 +1137,15 @@ long lcl_LineSize( const SvxBorderLine& rLine ) DBG_ASSERT( rLine.GetOutWidth() && rLine.GetInWidth(), "Linie hat Abstand, aber nur eine Breite ???" ); -// nTotal += ( nDist > 40 ) ? ( nDist / 2 ) : 20; +// nTotal += ( nDist > 40 ) ? ( nDist / 2 ) : 20; nTotal += ( nDist > 20 ) ? nDist : 20; nTotal += ( nWidth > 20 ) ? nWidth : 20; } else if (nWidth) -// nTotal += ( nWidth > 40 ) ? ( nWidth / 2 ) : 20; +// nTotal += ( nWidth > 40 ) ? ( nWidth / 2 ) : 20; nTotal += ( nWidth > 20 ) ? nWidth : 20; - //! auch halbieren ??? + //! auch halbieren ??? return nTotal; } @@ -1164,7 +1164,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, const SvxBorderLine* pLine = 0; long nCmp; - // oben + // oben pItem = (const SvxBoxItem*) &pData[nStartIndex].pPattern->GetItem(ATTR_BORDER); pLine = pItem->GetTop(); @@ -1176,7 +1176,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, bFound = TRUE; } - // unten + // unten if ( nEndIndex != nStartIndex ) pItem = (const SvxBoxItem*) &pData[nEndIndex].pPattern->GetItem(ATTR_BORDER); @@ -1194,7 +1194,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, { pItem = (const SvxBoxItem*) &pData[i].pPattern->GetItem(ATTR_BORDER); - // links + // links if (bLeft) { @@ -1208,7 +1208,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, } } - // rechts + // rechts if (bRight) { @@ -1226,7 +1226,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, return bFound; } -// Testen, ob Bereich bestimmtes Attribut enthaelt +// Testen, ob Bereich bestimmtes Attribut enthaelt bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const { @@ -1341,8 +1341,8 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const return bFound; } -// Bereich um evtl. enthaltene Zusammenfassungen erweitern -// und evtl. MergeFlag anpassen (bRefresh) +// Bereich um evtl. enthaltene Zusammenfassungen erweitern +// und evtl. MergeFlag anpassen (bRefresh) BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, @@ -1360,8 +1360,8 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, { pPattern = pData[i].pPattern; pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); - SCsCOL nCountX = pItem->GetColMerge(); - SCsROW nCountY = pItem->GetRowMerge(); + SCsCOL nCountX = pItem->GetColMerge(); + SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) { SCROW nThisRow = (i>0) ? pData[i-1].nRow+1 : 0; @@ -1398,7 +1398,7 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, pDocument->ApplyFlagsTab( nThisCol+1, nThisRow+1, nMergeEndCol, nMergeEndRow, nTab, SC_MF_HOR | SC_MF_VER ); - Search( nThisRow, i ); // Daten wurden veraendert + Search( nThisRow, i ); // Daten wurden veraendert Search( nStartRow, nStartIndex ); Search( nEndRow, nEndIndex ); } @@ -1429,8 +1429,8 @@ BOOL ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) pPattern = pData[nIndex].pPattern; pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); - SCsCOL nCountX = pItem->GetColMerge(); - SCsROW nCountY = pItem->GetRowMerge(); + SCsCOL nCountX = pItem->GetColMerge(); + SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) { const ScMergeAttr* pAttr = (const ScMergeAttr*) @@ -1444,32 +1444,32 @@ BOOL ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) SCCOL nMergeEndCol = nThisCol + nCountX - 1; SCROW nMergeEndRow = nThisEnd + nCountY - 1; - //! ApplyAttr fuer Bereiche !!! + //! ApplyAttr fuer Bereiche !!! for (SCROW nThisRow = nThisStart; nThisRow <= nThisEnd; nThisRow++) pDocument->ApplyAttr( nThisCol, nThisRow, nTab, *pAttr ); - ScPatternAttr* pNewPattern = new ScPatternAttr( pDocument->GetPool() ); - SfxItemSet* pSet = &pNewPattern->GetItemSet(); + ScPatternAttr* pNewPattern = new ScPatternAttr( pDocument->GetPool() ); + SfxItemSet* pSet = &pNewPattern->GetItemSet(); pSet->Put( *pFlagAttr ); pDocument->ApplyPatternAreaTab( nThisCol, nThisStart, nMergeEndCol, nMergeEndRow, nTab, *pNewPattern ); delete pNewPattern; - Search( nThisEnd, nIndex ); // Daten wurden veraendert !!! + Search( nThisEnd, nIndex ); // Daten wurden veraendert !!! } ++nIndex; if ( nIndex < nCount ) nThisStart = pData[nIndex-1].nRow+1; else - nThisStart = MAXROW+1; // Ende + nThisStart = MAXROW+1; // Ende } return bFound; } - // Bereich loeschen, aber Merge-Flags stehenlassen + // Bereich loeschen, aber Merge-Flags stehenlassen void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) { @@ -1480,20 +1480,20 @@ void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, BOOL bDefault ) { - const ScPatternAttr* pOldPattern; - const ScMergeFlagAttr* pItem; + const ScPatternAttr* pOldPattern; + const ScMergeFlagAttr* pItem; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bFirstUse = TRUE; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bFirstUse = TRUE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; while ( nThisRow <= nEndRow ) { pOldPattern = pData[nIndex].pPattern; - if (pOldPattern != pWantedPattern) //! else-Zweig ? + if (pOldPattern != pWantedPattern) //! else-Zweig ? { if (nThisRow < nStartRow) nThisRow = nStartRow; nRow = pData[nIndex].nRow; @@ -1502,12 +1502,12 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, if (pItem->IsOverlapped() || pItem->HasAutoFilter()) { - // #108045# default-constructing a ScPatternAttr for DeleteArea doesn't work - // because it would have no cell style information. - // Instead, the document's GetDefPattern is copied. Since it is passed as - // pWantedPattern, no special treatment of default is needed here anymore. - ScPatternAttr* pNewPattern = new ScPatternAttr( *pWantedPattern ); - SfxItemSet* pSet = &pNewPattern->GetItemSet(); + // #108045# default-constructing a ScPatternAttr for DeleteArea doesn't work + // because it would have no cell style information. + // Instead, the document's GetDefPattern is copied. Since it is passed as + // pWantedPattern, no special treatment of default is needed here anymore. + ScPatternAttr* pNewPattern = new ScPatternAttr( *pWantedPattern ); + SfxItemSet* pSet = &pNewPattern->GetItemSet(); pSet->Put( *pItem ); SetPatternArea( nThisRow, nAttrRow, pNewPattern, TRUE ); delete pNewPattern; @@ -1519,12 +1519,12 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, if (bFirstUse) bFirstUse = FALSE; else - pDocument->GetPool()->Put( *pWantedPattern ); // im Pool ist es schon! + pDocument->GetPool()->Put( *pWantedPattern ); // im Pool ist es schon! } SetPatternArea( nThisRow, nAttrRow, pWantedPattern ); } - Search( nThisRow, nIndex ); // Daten wurden veraendert !!! + Search( nThisRow, nIndex ); // Daten wurden veraendert !!! } ++nIndex; @@ -1537,11 +1537,11 @@ BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) { const ScPatternAttr* pOldPattern; - INT16 nOldValue; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bChanged = FALSE; + INT16 nOldValue; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bChanged = FALSE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1558,7 +1558,7 @@ BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) ScPatternAttr aNewPattern(*pOldPattern); aNewPattern.GetItemSet().Put( ScMergeFlagAttr( nOldValue | nFlags ) ); SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE ); - Search( nThisRow, nIndex ); // Daten wurden veraendert !!! + Search( nThisRow, nIndex ); // Daten wurden veraendert !!! bChanged = TRUE; } @@ -1574,11 +1574,11 @@ BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) { const ScPatternAttr* pOldPattern; - INT16 nOldValue; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bChanged = FALSE; + INT16 nOldValue; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bChanged = FALSE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1595,7 +1595,7 @@ BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) ScPatternAttr aNewPattern(*pOldPattern); aNewPattern.GetItemSet().Put( ScMergeFlagAttr( nOldValue & ~nFlags ) ); SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE ); - Search( nThisRow, nIndex ); // Daten wurden veraendert !!! + Search( nThisRow, nIndex ); // Daten wurden veraendert !!! bChanged = TRUE; } @@ -1611,9 +1611,9 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhi { const ScPatternAttr* pOldPattern; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1630,7 +1630,7 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhi nRow = pData[nIndex].nRow; SCROW nAttrRow = Min( (SCROW)nRow, (SCROW)nEndRow ); SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE ); - Search( nThisRow, nIndex ); // Daten wurden veraendert !!! + Search( nThisRow, nIndex ); // Daten wurden veraendert !!! } ++nIndex; @@ -1687,11 +1687,11 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement SetPatternArea( nThisStart, nAttrRow, &aNewPattern, TRUE ); nThisStart = nThisEnd + 1; - Search( nThisStart, nIndex ); // Daten wurden veraendert !!! + Search( nThisStart, nIndex ); // Daten wurden veraendert !!! } else { - nThisStart = pData[nIndex].nRow + 1; // weiterzaehlen... + nThisStart = pData[nIndex].nRow + 1; // weiterzaehlen... ++nIndex; } } @@ -1711,7 +1711,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const if (bUp) { if (nIndex==0) - return -1; // nichts gefunden + return -1; // nichts gefunden --nIndex; nRet = pData[nIndex].nRow; } @@ -1720,7 +1720,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const nRet = pData[nIndex].nRow+1; ++nIndex; if (nIndex>=nCount) - return MAXROW+1; // nichts gefunden + return MAXROW+1; // nichts gefunden } } } @@ -1736,8 +1736,8 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo SCROW nEnd = pData[nPos].nRow; if (pData[nPos].pPattern->GetStyleSheet() == pStyleSheet) { -// for (SCROW nRow = nStart; nRow <= nEnd; nRow++) -// pUsed[nRow] = TRUE; +// for (SCROW nRow = nStart; nRow <= nEnd; nRow++) +// pUsed[nRow] = TRUE; rUsedRows.setTrue(nStart, nEnd); @@ -1757,7 +1757,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo if (Concat(nPos)) { Search(nStart, nPos); - --nPos; // wegen ++ am Ende + --nPos; // wegen ++ am Ende } } } @@ -1770,8 +1770,8 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo BOOL ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const { - BOOL bIsUsed = FALSE; - SCSIZE nPos = 0; + BOOL bIsUsed = FALSE; + SCSIZE nPos = 0; while ( nPos < nCount ) { @@ -1810,7 +1810,7 @@ BOOL ScAttrArray::IsEmpty() const //UNUSED2008-05 SCROW ScAttrArray::GetFirstEntryPos() const //UNUSED2008-05 { //UNUSED2008-05 DBG_ASSERT( nCount, "nCount = 0" ); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 if ( pData[0].pPattern != pDocument->GetDefPattern() ) //UNUSED2008-05 return 0; //UNUSED2008-05 else @@ -1821,15 +1821,15 @@ BOOL ScAttrArray::IsEmpty() const //UNUSED2008-05 return pData[0].nRow + 1; //UNUSED2008-05 } //UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 SCROW ScAttrArray::GetLastEntryPos( BOOL bIncludeBottom ) const //UNUSED2008-05 { //UNUSED2008-05 DBG_ASSERT( nCount, "nCount == 0" ); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 if (bIncludeBottom) //UNUSED2008-05 bIncludeBottom = ( pData[nCount-1].pPattern != pDocument->GetDefPattern() ); -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 if (bIncludeBottom) //UNUSED2008-05 return MAXROW; //UNUSED2008-05 else @@ -1855,7 +1855,7 @@ BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const SCSIZE nVisStart = 1; while ( nVisStart < nCount && pData[nVisStart].pPattern->IsVisibleEqual(*pData[nVisStart-1].pPattern) ) ++nVisStart; - if ( nVisStart >= nCount || pData[nVisStart-1].nRow > 0 ) // more than 1 row? + if ( nVisStart >= nCount || pData[nVisStart-1].nRow > 0 ) // more than 1 row? nStart = nVisStart; while ( nStart < nCount && !bFound ) @@ -1983,7 +1983,7 @@ BOOL ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther, BOOL ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const { - //! mit IsVisibleEqual zusammenfassen? + //! mit IsVisibleEqual zusammenfassen? BOOL bEqual = TRUE; SCSIZE nThisPos = 0; @@ -2020,8 +2020,8 @@ BOOL ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const { - // horizontal zusammengefasste duerfen nicht herausgeschoben werden - // (ob die ganze Zusammenfassung betroffen ist, ist hier nicht zu erkennen) + // horizontal zusammengefasste duerfen nicht herausgeschoben werden + // (ob die ganze Zusammenfassung betroffen ist, ist hier nicht zu erkennen) BOOL bTest = TRUE; if (!IsEmpty()) @@ -2035,10 +2035,10 @@ BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const if ( ((const ScMergeFlagAttr&)pData[nIndex].pPattern-> GetItem(ATTR_MERGE_FLAG)).IsHorOverlapped() ) { - bTest = FALSE; // darf nicht herausgeschoben werden + bTest = FALSE; // darf nicht herausgeschoben werden break; } - if ( pData[nIndex].nRow >= nEndRow ) // Ende des Bereichs + if ( pData[nIndex].nRow >= nEndRow ) // Ende des Bereichs break; } } @@ -2048,12 +2048,12 @@ BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const BOOL ScAttrArray::TestInsertRow( SCSIZE nSize ) const { - // wenn die erste herausgeschobene Zeile vertikal ueberlappt ist, - // wuerde eine kaputte Zusammenfassung uebrigbleiben + // wenn die erste herausgeschobene Zeile vertikal ueberlappt ist, + // wuerde eine kaputte Zusammenfassung uebrigbleiben if (pData) { - // MAXROW + 1 - nSize = erste herausgeschobene Zeile + // MAXROW + 1 - nSize = erste herausgeschobene Zeile SCSIZE nFirstLost = nCount-1; while ( nFirstLost && pData[nFirstLost-1].nRow >= sal::static_int_cast(MAXROW + 1 - nSize) ) @@ -2073,12 +2073,12 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) if (!pData) return; - SCROW nSearch = nStartRow > 0 ? nStartRow - 1 : 0; // Vorgaenger erweitern + SCROW nSearch = nStartRow > 0 ? nStartRow - 1 : 0; // Vorgaenger erweitern SCSIZE nIndex; Search( nSearch, nIndex ); - // ein gesetztes ScMergeAttr darf nicht ausgedehnt werden - // (darum hinterher wieder loeschen) + // ein gesetztes ScMergeAttr darf nicht ausgedehnt werden + // (darum hinterher wieder loeschen) BOOL bDoMerge = ((const ScMergeAttr&) pData[nIndex].pPattern->GetItem(ATTR_MERGE)).IsMerged(); @@ -2087,29 +2087,29 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) for (i = nIndex; i < nCount-1; i++) { SCROW nNew = pData[i].nRow + nSize; - if ( nNew >= MAXROW ) // Ende erreicht ? + if ( nNew >= MAXROW ) // Ende erreicht ? { nNew = MAXROW; if (!nRemove) - nRemove = i+1; // folgende loeschen + nRemove = i+1; // folgende loeschen } pData[i].nRow = nNew; } - // muessen Eintraege am Ende geloescht werden? + // muessen Eintraege am Ende geloescht werden? if (nRemove && nRemove < nCount) DeleteRange( nRemove, nCount-1 ); - if (bDoMerge) // ausgedehntes ScMergeAttr wieder reparieren + if (bDoMerge) // ausgedehntes ScMergeAttr wieder reparieren { - //! ApplyAttr fuer Bereiche !!! + //! ApplyAttr fuer Bereiche !!! const SfxPoolItem& rDef = pDocument->GetPool()->GetDefaultItem( ATTR_MERGE ); for (SCSIZE nAdd=0; nAddApplyAttr( nCol, nStartRow+nAdd, nTab, rDef ); - // im eingefuegten Bereich ist nichts zusammengefasst + // im eingefuegten Bereich ist nichts zusammengefasst } // Don't duplicate the merge flags in the inserted row. @@ -2162,8 +2162,8 @@ void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize ) if (pData[i].nRow >= nStartRow) pData[i].nRow -= nSize; -// unten nicht Default-Pattern nachschieben, um Druckbereiche erkennen zu koennen -// stattdessen nur Merge-Flags loeschen +// unten nicht Default-Pattern nachschieben, um Druckbereiche erkennen zu koennen +// stattdessen nur Merge-Flags loeschen RemoveFlags( MAXROW-nSize+1, MAXROW, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO ); } @@ -2183,12 +2183,12 @@ void ScAttrArray::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ) void ScAttrArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) { - RemoveAreaMerge( nStartRow, nEndRow ); // von zusammengefassten auch die Flags loeschen + RemoveAreaMerge( nStartRow, nEndRow ); // von zusammengefassten auch die Flags loeschen if ( !HasAttrib( nStartRow, nEndRow, HASATTR_OVERLAPPED | HASATTR_AUTOFILTER) ) SetPatternArea( nStartRow, nEndRow, pDocument->GetDefPattern() ); else - DeleteAreaSafe( nStartRow, nEndRow ); // Merge-Flags stehenlassen + DeleteAreaSafe( nStartRow, nEndRow ); // Merge-Flags stehenlassen } @@ -2197,9 +2197,9 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); const ScPatternAttr* pOldPattern; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -2209,7 +2209,7 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) { pOldPattern = pData[nIndex].pPattern; - if ( pOldPattern->GetItemSet().Count() ) // harte Attribute ? + if ( pOldPattern->GetItemSet().Count() ) // harte Attribute ? { nRow = pData[nIndex].nRow; SCROW nAttrRow = Min( (SCROW)nRow, (SCROW)nEndRow ); @@ -2225,7 +2225,7 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) else SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE ); - Search( nThisRow, nIndex ); // Daten wurden veraendert !!! + Search( nThisRow, nIndex ); // Daten wurden veraendert !!! } ++nIndex; @@ -2242,7 +2242,7 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray { if ((pData[i].nRow >= nStartRow) && ((i==0) ? TRUE : pData[i-1].nRow < nEndRow)) { - // Kopieren (bPutToPool=TRUE) + // Kopieren (bPutToPool=TRUE) rAttrArray.SetPatternArea( nStart, Min( (SCROW)pData[i].nRow, (SCROW)nEndRow ), pData[i].pPattern, TRUE ); } @@ -2257,7 +2257,7 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, INT16 nStripFlags ) { - nStartRow -= nDy; // Source + nStartRow -= nDy; // Source nEndRow -= nDy; SCROW nDestStart = Max((long)((long)nStartRow + nDy), (long) 0); @@ -2276,7 +2276,7 @@ void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArra if (IsDefaultItem( pOldPattern )) { - // am Default muss nichts veraendert werden + // am Default muss nichts veraendert werden pNewPattern = (const ScPatternAttr*) &pDestDocPool->GetDefaultItem( ATTR_PATTERN ); @@ -2323,7 +2323,7 @@ void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArra void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ) { - nStartRow -= nDy; // Source + nStartRow -= nDy; // Source nEndRow -= nDy; SCROW nDestStart = Max((long)((long)nStartRow + nDy), (long) 0); @@ -2467,7 +2467,7 @@ BOOL ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, //------------------------------------------------------------------------ // -// Laden / Speichern +// Laden / Speichern // @@ -2503,7 +2503,7 @@ void ScAttrArray::Save( SvStream& /* rStream */ ) const const ScPatternAttr* pPattern = pData[i].pPattern; pDocPool->StoreSurrogate( rStream, pPattern ); - // FALSE, weil ATTR_CONDITIONAL (noch) nicht in Vorlagen: + // FALSE, weil ATTR_CONDITIONAL (noch) nicht in Vorlagen: if (pPattern->GetItemSet().GetItemState(ATTR_CONDITIONAL,FALSE,&pItem) == SFX_ITEM_SET) pDocument->SetConditionalUsed( ((const SfxUInt32Item*)pItem)->GetValue() ); @@ -2562,7 +2562,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ ) if ( pDocument->GetSrcMaxRow() != MAXROW ) // Ende anpassen? { - // Ende immer auf MAXROW umsetzen (nur auf 32 Bit) + // Ende immer auf MAXROW umsetzen (nur auf 32 Bit) DBG_ASSERT( pData[nCount-1].nRow == pDocument->GetSrcMaxRow(), "Attribut-Ende ?!?" ); pData[nCount-1].nRow = MAXROW; @@ -2578,7 +2578,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ ) //UNUSED2008-05 const ULONG nFlags = FONTTOSUBSFONT_IMPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS; //UNUSED2008-05 SCSIZE nIndex = 0; //UNUSED2008-05 SCROW nThisRow = 0; -//UNUSED2008-05 +//UNUSED2008-05 //UNUSED2008-05 while ( nThisRow <= MAXROW ) //UNUSED2008-05 { //UNUSED2008-05 const ScPatternAttr* pOldPattern = pData[nIndex].pPattern; diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 301883197fb8..1b0662445b77 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -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,30 +53,30 @@ #include "sc.hrc" #include "globstr.hrc" -#include "textuno.hxx" // ScHeaderFooterContentObj +#include "textuno.hxx" // ScHeaderFooterContentObj using namespace com::sun::star; //------------------------------------------------------------------------ -TYPEINIT1(ScMergeAttr, SfxPoolItem); +TYPEINIT1(ScMergeAttr, SfxPoolItem); TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem); -TYPEINIT1(ScRangeItem, SfxPoolItem); -TYPEINIT1(ScTableListItem, SfxPoolItem); -TYPEINIT1(ScPageHFItem, SfxPoolItem); +TYPEINIT1(ScRangeItem, SfxPoolItem); +TYPEINIT1(ScTableListItem, SfxPoolItem); +TYPEINIT1(ScPageHFItem, SfxPoolItem); TYPEINIT1(ScViewObjectModeItem, SfxEnumItem); -TYPEINIT1(ScDoubleItem, SfxPoolItem); +TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); //------------------------------------------------------------------------ // -// allgemeine Hilfsfunktionen +// allgemeine Hilfsfunktionen // BOOL ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { -// DBG_ASSERT( pThis || pOther, "LineAttr == 0" ); +// DBG_ASSERT( pThis || pOther, "LineAttr == 0" ); if (!pThis) return FALSE; @@ -98,14 +98,14 @@ BOOL ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) return FALSE; else { - return TRUE; //! ??? + return TRUE; //! ??? } } } // -// Item - Implementierungen +// Item - Implementierungen // //------------------------------------------------------------------------ @@ -172,8 +172,8 @@ SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT /* nVer */ ) const { - INT16 nCol; - INT16 nRow; + INT16 nCol; + INT16 nRow; rStream >> nCol; rStream >> nRow; return new ScMergeAttr(static_cast(nCol),static_cast(nRow)); @@ -231,8 +231,8 @@ ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): { bProtection = rItem.bProtection; bHideFormula = rItem.bHideFormula; - bHideCell = rItem.bHideCell; - bHidePrint = rItem.bHidePrint; + bHideCell = rItem.bHideCell; + bHidePrint = rItem.bHidePrint; } ScProtectionAttr::~ScProtectionAttr() @@ -320,11 +320,11 @@ String ScProtectionAttr::GetValueText() const String aStrNo ( ScGlobal::GetRscString(STR_NO) ); sal_Unicode cDelim = ','; - aValue = '('; - aValue += (bProtection ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHideFormula ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHideCell ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHidePrint ? aStrYes : aStrNo); + aValue = '('; + aValue += (bProtection ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHideFormula ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHideCell ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHidePrint ? aStrYes : aStrNo); aValue += ')'; return aValue; @@ -341,9 +341,9 @@ SfxItemPresentation ScProtectionAttr::GetPresentation const IntlWrapper* /* pIntl */ ) const { - String aStrYes ( ScGlobal::GetRscString(STR_YES) ); - String aStrNo ( ScGlobal::GetRscString(STR_NO) ); - String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); + String aStrYes ( ScGlobal::GetRscString(STR_YES) ); + String aStrNo ( ScGlobal::GetRscString(STR_NO) ); + String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); String aStrDelim = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); switch ( ePres ) @@ -358,12 +358,12 @@ SfxItemPresentation ScProtectionAttr::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_PROTECTION); rText += aStrSep; - rText += (bProtection ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_FORMULAS); rText += aStrSep; - rText += (!bHideFormula ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_HIDE); rText += aStrSep; - rText += (bHideCell ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_PRINT); rText += aStrSep; + rText += (bProtection ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_FORMULAS); rText += aStrSep; + rText += (!bHideFormula ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_HIDE); rText += aStrSep; + rText += (bHideCell ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_PRINT); rText += aStrSep; rText += (!bHidePrint ? aStrYes : aStrNo); break; @@ -443,7 +443,7 @@ BOOL ScProtectionAttr::SetHidePrint( BOOL bHPrint) } // ----------------------------------------------------------------------- -// ScRangeItem - Tabellenbereich +// ScRangeItem - Tabellenbereich // ----------------------------------------------------------------------- int ScRangeItem::operator==( const SfxPoolItem& rAttr ) const @@ -467,7 +467,7 @@ SfxItemPresentation ScRangeItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, SfxMapUnit /* ePresUnit */, - String& rText, + String& rText, const IntlWrapper* /* pIntl */ ) const { @@ -478,7 +478,7 @@ SfxItemPresentation ScRangeItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_AREA); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); -// break;// Durchfallen !!! +// break;// Durchfallen !!! case SFX_ITEM_PRESENTATION_NAMELESS: { @@ -499,12 +499,12 @@ SfxItemPresentation ScRangeItem::GetPresentation } // ----------------------------------------------------------------------- -// ScTableListItem - Liste von Tabellen(-nummern) +// ScTableListItem - Liste von Tabellen(-nummern) // ----------------------------------------------------------------------- ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) - : SfxPoolItem ( rCpy.Which() ), - nCount ( rCpy.nCount ) + : SfxPoolItem ( rCpy.Which() ), + nCount ( rCpy.nCount ) { if ( nCount > 0 ) { @@ -560,12 +560,12 @@ int ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); - ScTableListItem& rCmp = (ScTableListItem&)rAttr; - BOOL bEqual = (nCount == rCmp.nCount); + ScTableListItem& rCmp = (ScTableListItem&)rAttr; + BOOL bEqual = (nCount == rCmp.nCount); if ( nCount > 0 ) { - USHORT i=0; + USHORT i=0; bEqual = ( pTabArr && rCmp.pTabArr ); @@ -590,9 +590,9 @@ SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const SfxItemPresentation ScTableListItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreUnit */, - SfxMapUnit /* ePresUnit */, - String& rText, + SfxMapUnit /* eCoreUnit */, + SfxMapUnit /* ePresUnit */, + String& rText, const IntlWrapper* /* pIntl */ ) const { @@ -637,7 +637,7 @@ SfxItemPresentation ScTableListItem::GetPresentation //UNUSED2009-05 { //UNUSED2009-05 for ( USHORT i=0; i 0 ); //UNUSED2009-05 } @@ -646,13 +646,13 @@ SfxItemPresentation ScTableListItem::GetPresentation //UNUSED2009-05 void ScTableListItem::SetTableList( const List& rList ) //UNUSED2009-05 { //UNUSED2009-05 nCount = (USHORT)rList.Count(); -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 delete [] pTabArr; -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 if ( nCount > 0 ) //UNUSED2009-05 { //UNUSED2009-05 pTabArr = new SCTAB [nCount]; -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 for ( USHORT i=0; iClone(); @@ -771,7 +771,7 @@ int ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScPageHFItem& r = (const ScPageHFItem&)rItem; + const ScPageHFItem& r = (const ScPageHFItem&)rItem; return ScGlobal::EETextObjEqual(pLeftArea, r.pLeftArea) && ScGlobal::EETextObjEqual(pCenterArea, r.pCenterArea) @@ -845,13 +845,13 @@ BOOL lcl_ConvertFields(EditEngine& rEng, const String* pCommands) return bChange; } -#define SC_FIELD_COUNT 6 +#define SC_FIELD_COUNT 6 SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const { - EditTextObject* pLeft = EditTextObject::Create(rStream); + EditTextObject* pLeft = EditTextObject::Create(rStream); EditTextObject* pCenter = EditTextObject::Create(rStream); - EditTextObject* pRight = EditTextObject::Create(rStream); + EditTextObject* pRight = EditTextObject::Create(rStream); DBG_ASSERT( pLeft && pCenter && pRight, "Error reading ScPageHFItem" ); @@ -859,9 +859,9 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const pCenter == NULL || pCenter->GetParagraphCount() == 0 || pRight == NULL || pRight->GetParagraphCount() == 0 ) { - // If successfully loaded, each object contains at least one paragraph. - // Excel import in 5.1 created broken TextObjects (#67442#) that are - // corrected here to avoid saving wrong files again (#90487#). + // If successfully loaded, each object contains at least one paragraph. + // Excel import in 5.1 created broken TextObjects (#67442#) that are + // corrected here to avoid saving wrong files again (#90487#). ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE ); if ( pLeft == NULL || pLeft->GetParagraphCount() == 0 ) @@ -881,7 +881,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const } } - if ( nVer < 1 ) // alte Feldbefehle umsetzen + if ( nVer < 1 ) // alte Feldbefehle umsetzen { USHORT i; const String& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER ); @@ -918,11 +918,11 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const } } else if ( nVer < 2 ) - { // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen + { // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen } ScPageHFItem* pItem = new ScPageHFItem( Which() ); - pItem->SetArea( pLeft, SC_HF_LEFTAREA ); + pItem->SetArea( pLeft, SC_HF_LEFTAREA ); pItem->SetArea( pCenter, SC_HF_CENTERAREA ); pItem->SetArea( pRight, SC_HF_RIGHTAREA ); @@ -937,18 +937,18 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const //UNUSED2009-05 USHORT nConvPara; //UNUSED2009-05 xub_StrLen nConvPos; //UNUSED2009-05 BOOL bConvert; -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 public: //UNUSED2009-05 ScFieldChangerEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool ); //UNUSED2009-05 virtual ~ScFieldChangerEditEngine() {} -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, //UNUSED2009-05 USHORT nPos, Color*& rTxtColor, //UNUSED2009-05 Color*& rFldColor ); -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 BOOL ConvertFields(); //UNUSED2009-05 }; -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pEnginePoolP, //UNUSED2009-05 BOOL bDeleteEnginePoolP ) : //UNUSED2009-05 ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ), @@ -958,7 +958,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const //UNUSED2009-05 bConvert( FALSE ) //UNUSED2009-05 { //UNUSED2009-05 } -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 String ScFieldChangerEditEngine::CalcFieldValue( const SvxFieldItem& rField, //UNUSED2009-05 USHORT nPara, USHORT nPos, Color*& /* rTxtColor */, Color*& /* rFldColor */ ) //UNUSED2009-05 { @@ -971,7 +971,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const //UNUSED2009-05 } //UNUSED2009-05 return EMPTY_STRING; //UNUSED2009-05 } -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 BOOL ScFieldChangerEditEngine::ConvertFields() //UNUSED2009-05 { //UNUSED2009-05 BOOL bConverted = FALSE; @@ -1015,16 +1015,16 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) { switch ( nArea ) { - case SC_HF_LEFTAREA: delete pLeftArea; pLeftArea = pNew; break; + case SC_HF_LEFTAREA: delete pLeftArea; pLeftArea = pNew; break; case SC_HF_CENTERAREA: delete pCenterArea; pCenterArea = pNew; break; - case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break; + case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break; default: DBG_ERROR( "New Area?" ); } } //----------------------------------------------------------------------- -// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten +// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten //----------------------------------------------------------------------- ScViewObjectModeItem::ScViewObjectModeItem( USHORT nWhichP ) @@ -1052,11 +1052,11 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, SfxMapUnit /* ePresUnit */, - String& rText, + String& rText, const IntlWrapper* /* pIntl */ -) const +) const { - String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); + String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); rText.Erase(); switch ( ePres ) @@ -1083,7 +1083,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation ePres = SFX_ITEM_PRESENTATION_NAMELESS;//das geht immer! break; } -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue()); @@ -1131,8 +1131,8 @@ USHORT ScViewObjectModeItem::GetVersion( USHORT /* nFileVersion */ ) const //------------------------------------------------------------------------ SfxPoolItem* ScViewObjectModeItem::Create( - SvStream& rStream, - USHORT nVersion ) const + SvStream& rStream, + USHORT nVersion ) const { if ( nVersion == 0 ) { @@ -1152,19 +1152,19 @@ SfxPoolItem* ScViewObjectModeItem::Create( } // ----------------------------------------------------------------------- -// double +// double // ----------------------------------------------------------------------- ScDoubleItem::ScDoubleItem( USHORT nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), - nValue ( nVal ) + nValue ( nVal ) { } //------------------------------------------------------------------------ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) - : SfxPoolItem ( rItem ) + : SfxPoolItem ( rItem ) { nValue = rItem.nValue; } diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx index c9abd4aa90b8..dd080362afdd 100644 --- a/sc/source/core/data/autonamecache.cxx +++ b/sc/source/core/data/autonamecache.cxx @@ -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/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 540fb577a79b..7e7653ee50c8 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -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 @@ -92,9 +92,9 @@ static SCSIZE nBcaSlotsRow = BCA_SLOTS_ROW; static SCSIZE nBcaSlots = BCA_SLOTS_DEFINE; #else // Logarithmic or any other distribution. -// Upper sheet part usually is more populated and referenced and gets fine +// Upper sheet part usually is more populated and referenced and gets fine // grained resolution, larger data in larger hunks. -// Could be further enhanced by also applying a different distribution of +// Could be further enhanced by also applying a different distribution of // column slots. static SCSIZE initSlotDistribution( ScSlotDistribution & rSD, SCSIZE & rBSR ) { @@ -184,9 +184,9 @@ bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, return false; if ( !rpArea ) { - // Even if most times the area doesn't exist yet and immediately trying - // to new and insert it would save an attempt to find it, on mass - // operations like identical large [HV]LOOKUP() areas the new/delete + // Even if most times the area doesn't exist yet and immediately trying + // to new and insert it would save an attempt to find it, on mass + // operations like identical large [HV]LOOKUP() areas the new/delete // would add quite some penalty for all but the first formula cell. ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange)); if (aIter != aBroadcastAreaTbl.end()) @@ -284,7 +284,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const return FALSE; BOOL bIsBroadcasted = FALSE; const ScAddress& rAddress = rHint.GetAddress(); - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); + for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); aIter != aBroadcastAreaTbl.end(); /* increment in body */ ) { ScBroadcastArea* pArea = *aIter; @@ -312,7 +312,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, if (aBroadcastAreaTbl.empty()) return FALSE; BOOL bIsBroadcasted = FALSE; - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); + for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); aIter != aBroadcastAreaTbl.end(); /* increment in body */ ) { ScBroadcastArea* pArea = *aIter; @@ -421,7 +421,7 @@ void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) { - ::std::pair< ScBroadcastAreas::iterator, bool > aPair = + ::std::pair< ScBroadcastAreas::iterator, bool > aPair = aBroadcastAreaTbl.insert( pArea ); if (aPair.second) pArea->IncRef(); @@ -572,9 +572,9 @@ void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, *pp = new ScBroadcastAreaSlot( pDoc, this ); if (!pArea) { - // If the call to StartListeningArea didn't create the - // ScBroadcastArea, listeners were added to an already - // existing identical area that doesn't need to be inserted + // If the call to StartListeningArea didn't create the + // ScBroadcastArea, listeners were added to an already + // existing identical area that doesn't need to be inserted // to slots again. if (!(*pp)->StartListeningArea( rRange, pListener, pArea)) bDone = true; @@ -620,7 +620,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, ScBroadcastArea* pArea = NULL; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -661,7 +661,7 @@ BOOL ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const TableSlotsMap::const_iterator iTab( aTableSlotsMap.find( rAddress.Tab())); if (iTab == aTableSlotsMap.end()) return FALSE; - ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( + ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( ComputeSlotOffset( rAddress)); if ( pSlot ) return pSlot->AreaBroadcast( rHint ); @@ -711,7 +711,7 @@ void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( ScBroadcastAreaSlot** pp = ppSlots + nOff; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -751,7 +751,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( ScBroadcastAreaSlot** pp = ppSlots + nOff; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -771,7 +771,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( } } - // Updating an area's range will modify the hash key, remove areas from all + // Updating an area's range will modify the hash key, remove areas from all // affected slots. Will be reinserted later with the updated range. ScBroadcastArea* pChain = pUpdateChain; while (pChain) @@ -801,7 +801,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( ComputeNextSlot( nOff, nBreak, pp, nStart, ppSlots, nRowBreak); } } - + } // shift sheets @@ -900,7 +900,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( pArea->SetUpdateChainNext( NULL ); pArea->SetInUpdateChain( FALSE ); - // Delete if not inserted to any slot. RemoveBulkArea(pArea) was + // Delete if not inserted to any slot. RemoveBulkArea(pArea) was // already executed in UpdateRemove(). if (!pArea->GetRef()) delete pArea; diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index aa492630ab0e..1ea4b225943d 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -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 @@ -77,7 +77,7 @@ const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell); IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell, nMemPoolValueCell, nMemPoolValueCell ) IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell ) IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell, nMemPoolStringCell, nMemPoolStringCell ) -IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell ) +IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell ) #endif // ============================================================================ @@ -240,7 +240,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) && !((ScFormulaCell*)this)->IsInChangeTrack() ) { - pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... + pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... ScFormulaCell* pFormCell = (ScFormulaCell*)this; ScTokenArray* pArr = pFormCell->GetCode(); @@ -273,9 +273,9 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) if ( rRef1.Valid() && rRef2.Valid() ) { if ( t->GetOpCode() == ocColRowNameAuto ) - { // automagically + { // automagically if ( rRef1.IsColRel() ) - { // ColName + { // ColName pDoc->StartListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -285,7 +285,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) rRef2.nTab ), pFormCell ); } else - { // RowName + { // RowName pDoc->StartListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -316,7 +316,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) } } -// pArr gesetzt -> Referenzen von anderer Zelle nehmen +// pArr gesetzt -> Referenzen von anderer Zelle nehmen // dann muss auch aPos uebergeben werden! void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, @@ -326,7 +326,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, && !((ScFormulaCell*)this)->IsInChangeTrack() ) { - pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... + pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... ScFormulaCell* pFormCell = (ScFormulaCell*)this; if( pFormCell->GetCode()->IsRecalcModeAlways() ) @@ -363,9 +363,9 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, if ( rRef1.Valid() && rRef2.Valid() ) { if ( t->GetOpCode() == ocColRowNameAuto ) - { // automagically + { // automagically if ( rRef1.IsColRel() ) - { // ColName + { // ColName pDoc->EndListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -375,7 +375,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, rRef2.nTab ), pFormCell ); } else - { // RowName + { // RowName pDoc->EndListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -472,13 +472,13 @@ String ScBaseCell::GetStringData() const ((const ScEditCell*)this)->GetString( aStr ); break; case CELLTYPE_FORMULA: - ((ScFormulaCell*)this)->GetString( aStr ); // an der Formelzelle nicht-const + ((ScFormulaCell*)this)->GetString( aStr ); // an der Formelzelle nicht-const break; } return aStr; } -// static +// static BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) { CellType eType1 = CELLTYPE_NONE; @@ -502,14 +502,14 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) if ( eType1 != eType2 ) return FALSE; - switch ( eType1 ) // beide Typen gleich + switch ( eType1 ) // beide Typen gleich { - case CELLTYPE_NONE: // beide leer + case CELLTYPE_NONE: // beide leer return TRUE; - case CELLTYPE_VALUE: // wirklich Value-Zellen + case CELLTYPE_VALUE: // wirklich Value-Zellen return ( ((const ScValueCell*)pCell1)->GetValue() == ((const ScValueCell*)pCell2)->GetValue() ); - case CELLTYPE_STRING: // String oder Edit + case CELLTYPE_STRING: // String oder Edit { String aText1; if ( pCell1->GetCellType() == CELLTYPE_STRING ) @@ -525,14 +525,14 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) } case CELLTYPE_FORMULA: { - //! eingefuegte Zeilen / Spalten beruecksichtigen !!!!! - //! Vergleichsfunktion an der Formelzelle ??? - //! Abfrage mit ScColumn::SwapRow zusammenfassen! + //! eingefuegte Zeilen / Spalten beruecksichtigen !!!!! + //! Vergleichsfunktion an der Formelzelle ??? + //! Abfrage mit ScColumn::SwapRow zusammenfassen! ScTokenArray* pCode1 = ((ScFormulaCell*)pCell1)->GetCode(); ScTokenArray* pCode2 = ((ScFormulaCell*)pCell2)->GetCode(); - if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN + if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN { BOOL bEqual = TRUE; USHORT nLen = pCode1->GetLen(); @@ -549,7 +549,7 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) return TRUE; } - return FALSE; // unterschiedlich lang oder unterschiedliche Tokens + return FALSE; // unterschiedlich lang oder unterschiedliche Tokens } default: DBG_ERROR("huch, was fuer Zellen???"); @@ -623,7 +623,7 @@ ScStringCell::~ScStringCell() // ============================================================================ // -// ScFormulaCell +// ScFormulaCell // ScFormulaCell::ScFormulaCell() : @@ -757,8 +757,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons pCode->ReadjustRelative3DReferences( rCell.aPos, aPos ); // evtl. Fehler zuruecksetzen und neu kompilieren - // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben - // Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler behalten + // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben + // Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler behalten if ( pCode->GetCodeError() && !pDocument->IsClipboard() && pCode->GetLen() ) { pCode->SetCodeError( 0 ); @@ -932,7 +932,7 @@ void ScFormulaCell::Compile( const String& rFormula, BOOL bNoListening, if( !pCode->GetCodeError() ) { if ( !pCode->GetLen() && aResult.GetHybridFormula().Len() && rFormula == aResult.GetHybridFormula() ) - { // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray + { // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray if ( rFormula.GetChar(0) == '=' ) pCode->AddBad( rFormula.GetBuffer() + 1 ); else @@ -992,7 +992,7 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening ) void ScFormulaCell::CompileXML( ScProgress& rProgress ) { if ( cMatrixFlag == MM_REFERENCE ) - { // is already token code via ScDocFunc::EnterMatrix, ScDocument::InsertMatrixFormula + { // is already token code via ScDocFunc::EnterMatrix, ScDocument::InsertMatrixFormula // just establish listeners StartListeningTo( pDocument ); return ; @@ -1036,8 +1036,8 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) SetScriptType( SC_SCRIPTTYPE_UNKNOWN ); } - // Same as in Load: after loading, it must be known if ocMacro is in any formula - // (for macro warning, CompileXML is called at the end of loading XML file) + // Same as in Load: after loading, it must be known if ocMacro is in any formula + // (for macro warning, CompileXML is called at the end of loading XML file) if ( !pDocument->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) ) pDocument->SetHasMacroFunc( TRUE ); } @@ -1096,7 +1096,7 @@ void ScFormulaCell::CalcAfterLoad() bDirty = TRUE; } if ( pCode->IsRecalcModeAlways() ) - { // zufall(), heute(), jetzt() bleiben immer im FormulaTree, damit sie + { // zufall(), heute(), jetzt() bleiben immer im FormulaTree, damit sie // auch bei jedem F9 berechnet werden. bDirty = TRUE; } @@ -1209,9 +1209,9 @@ void ScFormulaCell::Interpret() if (!IsDirtyOrInTableOpDirty() || pDocument->GetRecursionHelper().IsInReturn()) return; // no double/triple processing - //! HACK: - // Wenn der Aufruf aus einem Reschedule im DdeLink-Update kommt, dirty stehenlassen - // Besser: Dde-Link Update ohne Reschedule oder ganz asynchron !!! + //! HACK: + // Wenn der Aufruf aus einem Reschedule im DdeLink-Update kommt, dirty stehenlassen + // Besser: Dde-Link Update ohne Reschedule oder ganz asynchron !!! if ( pDocument->IsInDdeLinkUpdate() ) return; @@ -1782,9 +1782,9 @@ ULONG ScFormulaCell::GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFo return nFormatIndex; //! not ScFormulaCell::IsValue(), that could reinterpret the formula again. if ( aResult.IsValue() ) - return ScGlobal::GetStandardFormat( aResult.GetDouble(), rFormatter, nFormat, nFormatType ); + return ScGlobal::GetStandardFormat( aResult.GetDouble(), rFormatter, nFormat, nFormatType ); else - return ScGlobal::GetStandardFormat( rFormatter, nFormat, nFormatType ); + return ScGlobal::GetStandardFormat( rFormatter, nFormat, nFormatType ); } @@ -1905,7 +1905,7 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) if ( (nBits & RECALCMODE_EMASK) != RECALCMODE_NORMAL ) bDirty = TRUE; if ( nBits & RECALCMODE_ONLOAD_ONCE ) - { // OnLoadOnce nur zum Dirty setzen nach Filter-Import + { // OnLoadOnce nur zum Dirty setzen nach Filter-Import nBits = (nBits & ~RECALCMODE_EMASK) | RECALCMODE_NORMAL; } pCode->AddRecalcMode( nBits ); diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 1aab26acf3aa..c056c399e7e3 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -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 @@ -225,7 +225,7 @@ lcl_checkRangeDimensions( const bool bSameCols(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetCol)); const bool bSameRows(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetRow)); const bool bSameTabs(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetTab)); - + // Test if exactly two dimensions are equal if (!(bSameCols ^ bSameRows ^ bSameTabs) && (bSameCols || bSameRows || bSameTabs)) @@ -677,9 +677,9 @@ ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const intersection must be empty set. */ - // Detect the simple case of exactly one reference in advance without all + // Detect the simple case of exactly one reference in advance without all // overhead. - // #i107741# Doing so actually makes outlines using SUBTOTAL(x;reference) + // #i107741# Doing so actually makes outlines using SUBTOTAL(x;reference) // work again, where the function does not have only references. if (HasOneReference( rRange)) return true; diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx index 9ab5995ca26c..34cdef3600c8 100644 --- a/sc/source/core/data/clipparam.cxx +++ b/sc/source/core/data/clipparam.cxx @@ -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/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index e9fd26ced939..98f7b4c8b393 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -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 @@ -49,18 +49,18 @@ #include "compiler.hxx" #include "brdcst.hxx" #include "markdata.hxx" -#include "detfunc.hxx" // for Notes in Sort/Swap +#include "detfunc.hxx" // for Notes in Sort/Swap #include "postit.hxx" //#pragma optimize ( "", off ) -// nur Search ohne Optimierung! +// nur Search ohne Optimierung! // STATIC DATA ----------------------------------------------------------- using namespace formula; inline BOOL IsAmbiguousScriptNonZero( BYTE nScript ) { - //! move to a header file + //! move to a header file return ( nScript != SCRIPTTYPE_LATIN && nScript != SCRIPTTYPE_ASIAN && nScript != SCRIPTTYPE_COMPLEX && @@ -140,24 +140,24 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c if ( nEdges ) { if ( nEdges & 8 ) - bOpen = TRUE; // obere Kante oeffnet, weitersehen + bOpen = TRUE; // obere Kante oeffnet, weitersehen else if ( !bOpen ) - return nEdges | 32; // es gibt was, was nicht geoeffnet wurde + return nEdges | 32; // es gibt was, was nicht geoeffnet wurde else if ( nEdges & 1 ) - return nEdges; // mittendrin + return nEdges; // mittendrin // (nMask & 16 und (4 und nicht 16)) oder // (nMask & 4 und (16 und nicht 4)) if ( ((nMask & 16) && (nEdges & 4) && !(nEdges & 16)) || ((nMask & 4) && (nEdges & 16) && !(nEdges & 4)) ) - return nEdges; // nur linke/rechte Kante + return nEdges; // nur linke/rechte Kante if ( nEdges & 2 ) - bOpen = FALSE; // untere Kante schliesst + bOpen = FALSE; // untere Kante schliesst } } nIndex++; } if ( bOpen ) - nEdges |= 32; // es geht noch weiter + nEdges |= 32; // es geht noch weiter return nEdges; } } @@ -189,21 +189,21 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const if ( nEdges ) { if ( nEdges & 8 ) - bOpen = TRUE; // obere Kante oeffnet, weitersehen + bOpen = TRUE; // obere Kante oeffnet, weitersehen else if ( !bOpen ) - return TRUE; // es gibt was, was nicht geoeffnet wurde + return TRUE; // es gibt was, was nicht geoeffnet wurde else if ( nEdges & 1 ) - bFound = TRUE; // mittendrin, alles selektiert? + bFound = TRUE; // mittendrin, alles selektiert? // (4 und nicht 16) oder (16 und nicht 4) if ( (((nEdges & 4) | 16) ^ ((nEdges & 16) | 4)) ) - bFound = TRUE; // nur linke/rechte Kante, alles selektiert? + bFound = TRUE; // nur linke/rechte Kante, alles selektiert? if ( nEdges & 2 ) - bOpen = FALSE; // untere Kante schliesst + bOpen = FALSE; // untere Kante schliesst if ( bFound ) - { // alles selektiert? + { // alles selektiert? if ( aCurOrg != aOrg ) - { // neue Matrix zu pruefen? + { // neue Matrix zu pruefen? aCurOrg = aOrg; ScFormulaCell* pFCell; if ( ((ScFormulaCell*)pCell)->GetMatrixFlag() @@ -221,7 +221,7 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const bFound = FALSE; } else - bFound = FALSE; // war schon + bFound = FALSE; // war schon } } } @@ -435,7 +435,7 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow ); - // TRUE = alten Eintrag behalten + // TRUE = alten Eintrag behalten ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE ); ScDocumentPool::CheckRef( *pPattern ); @@ -566,7 +566,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& pNewStyle = pPattern->GetStyleSheet(); rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -575,7 +575,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& } -const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const +const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const { rFound = FALSE; @@ -593,7 +593,7 @@ const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo pNewStyle = pPattern->GetStyleSheet(); rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } @@ -644,8 +644,8 @@ void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow, void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) { - // um nur ein neues SetItem zu erzeugen, brauchen wir keinen SfxItemPoolCache. - //! Achtung: der SfxItemPoolCache scheint zuviele Refs fuer das neue SetItem zu erzeugen ?? + // um nur ein neues SetItem zu erzeugen, brauchen wir keinen SfxItemPoolCache. + //! Achtung: der SfxItemPoolCache scheint zuviele Refs fuer das neue SetItem zu erzeugen ?? ScDocumentPool* pDocPool = pDocument->GetPool(); @@ -657,7 +657,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) if ( pNewPattern != pOldPattern ) pAttrArray->SetPattern( nRow, pNewPattern ); else - pDocPool->Remove( *pNewPattern ); // ausser Spesen nichts gewesen + pDocPool->Remove( *pNewPattern ); // ausser Spesen nichts gewesen delete pTemp; @@ -667,7 +667,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow ); - // TRUE = alten Eintrag behalten + // TRUE = alten Eintrag behalten ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE ); ScDocumentPool::CheckRef( *pPattern ); @@ -712,25 +712,25 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const } long nOldLo, nOldHi; - long nLo = nOldLo = 0; - long nHi = nOldHi = Min(static_cast(nCount)-1, static_cast(nRow) ); - long i = 0; - BOOL bFound = FALSE; + long nLo = nOldLo = 0; + long nHi = nOldHi = Min(static_cast(nCount)-1, static_cast(nRow) ); + long i = 0; + BOOL bFound = FALSE; // quite continuous distribution? => interpolating search - BOOL bInterpol = (static_cast(nMaxRow - nMinRow) < nCount * 2); - SCROW nR; + BOOL bInterpol = (static_cast(nMaxRow - nMinRow) < nCount * 2); + SCROW nR; while ( !bFound && nLo <= nHi ) { if ( !bInterpol || nHi - nLo < 3 ) - i = (nLo+nHi) / 2; // no effort, no division by zero + i = (nLo+nHi) / 2; // no effort, no division by zero else - { // interpolating search - long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon substraction + { // interpolating search + long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon substraction i = nLo + (long)((long)(nRow - nLoRow) * (nHi - nLo) / (pItems[nHi].nRow - nLoRow)); if ( i < 0 || static_cast(i) >= nCount ) - { // oops ... + { // oops ... i = (nLo+nHi) / 2; bInterpol = FALSE; } @@ -814,7 +814,7 @@ void ScColumn::Resize( SCSIZE nSize ) pItems = pNewItems; } -// SwapRow zum Sortieren +// SwapRow zum Sortieren namespace { @@ -929,7 +929,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2) ScTokenArray* pCode1 = pFmlaCell1->GetCode(); ScTokenArray* pCode2 = pFmlaCell2->GetCode(); - if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN + if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN { BOOL bEqual = TRUE; USHORT nLen = pCode1->GetLen(); @@ -956,8 +956,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2) } } - // hier kein UpdateReference wegen #30529# - mitsortiert werden nur noch relative Referenzen -// long dy = (long)nRow2 - (long)nRow1; + // hier kein UpdateReference wegen #30529# - mitsortiert werden nur noch relative Referenzen +// long dy = (long)nRow2 - (long)nRow1; /* Create clone of pCell1 at position of pCell2 (pCell1 exists always, see variable swapping above). Do not clone the note, but move pointer of @@ -1073,12 +1073,12 @@ BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const bTest = (pItems[i].nRow < nStartRow) || (pItems[i].nRow > nEndRow) || pItems[i].pCell->IsBlank(); - // AttrArray testet nur zusammengefasste + // AttrArray testet nur zusammengefasste if ((bTest) && (pAttrArray)) bTest = pAttrArray->TestInsertCol(nStartRow, nEndRow); - //! rausgeschobene Attribute bei Undo beruecksichtigen + //! rausgeschobene Attribute bei Undo beruecksichtigen return bTest; } @@ -1098,7 +1098,7 @@ BOOL ScColumn::TestInsertRow( SCSIZE nSize ) const return pAttrArray->TestInsertRow( nSize ); #if 0 - //! rausgeschobene Attribute bei Undo beruecksichtigen + //! rausgeschobene Attribute bei Undo beruecksichtigen if ( nSize > static_cast(MAXROW) ) return FALSE; @@ -1119,7 +1119,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) { pAttrArray->InsertRow( nStartRow, nSize ); - //! Search + //! Search if ( !pItems || !nCount ) return; @@ -1130,7 +1130,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCSIZE nNewCount = nCount; BOOL bCountChanged = FALSE; @@ -1238,8 +1238,8 @@ void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKee nEndIndex = i; ++nBlockCount; - // im Clipboard muessen interpretierte Zellen stehen, um andere Formate - // (Text, Grafik...) erzueugen zu koennen + // im Clipboard muessen interpretierte Zellen stehen, um andere Formate + // (Text, Grafik...) erzueugen zu koennen if ( pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA ) { @@ -1293,7 +1293,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke if ( (nFlags & IDF_ATTRIB) != 0 ) { if ( (nFlags & IDF_STYLES) != IDF_STYLES ) - { // StyleSheets im Zieldokument bleiben erhalten + { // StyleSheets im Zieldokument bleiben erhalten // z.B. DIF und RTF Clipboard-Import for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ ) { @@ -1350,7 +1350,7 @@ void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke if (nRow1 > 0) CopyToColumn( 0, nRow1-1, IDF_FORMULA, FALSE, rColumn ); - CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData ); //! bMarked ???? + CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData ); //! bMarked ???? if (nRow2 < MAXROW) CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, FALSE, rColumn ); @@ -1376,14 +1376,14 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const } } - // Dummy: - // CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE ); + // Dummy: + // CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE ); } void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) { - // Dies ist die Szenario-Tabelle, die Daten werden hineinkopiert + // Dies ist die Szenario-Tabelle, die Daten werden hineinkopiert ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; @@ -1396,7 +1396,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) ((ScColumn&)rSrcCol). CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, *this ); - // UpdateUsed nicht noetig, schon in TestCopyScenario passiert + // UpdateUsed nicht noetig, schon in TestCopyScenario passiert SCsTAB nDz = nTab - rSrcCol.nTab; UpdateReference(URM_COPY, nCol, nStart, nTab, @@ -1405,7 +1405,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) UpdateCompile(); } - //! CopyToColumn "const" machen !!! + //! CopyToColumn "const" machen !!! pPattern = aAttrIter.Next( nStart, nEnd ); } @@ -1414,7 +1414,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const { - // Dies ist die Szenario-Tabelle, die Daten werden in die andere kopiert + // Dies ist die Szenario-Tabelle, die Daten werden in die andere kopiert ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; @@ -1427,7 +1427,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const ((ScColumn*)this)-> CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, rDestCol ); - // UpdateUsed nicht noetig, schon in TestCopyScenario passiert + // UpdateUsed nicht noetig, schon in TestCopyScenario passiert SCsTAB nDz = rDestCol.nTab - nTab; rDestCol.UpdateReference(URM_COPY, rDestCol.nCol, nStart, rDestCol.nTab, @@ -1436,7 +1436,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const rDestCol.UpdateCompile(); } - //! CopyToColumn "const" machen !!! + //! CopyToColumn "const" machen !!! pPattern = aAttrIter.Next( nStart, nEnd ); } @@ -1581,7 +1581,7 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol) ScAddress aAdr( nCol, 0, nTab ); ScHint aHint( SC_HINT_DYING, aAdr, NULL ); // areas only ScAddress& rAddress = aHint.GetAddress(); - ScNoteCell* pNoteCell = new ScNoteCell; // Dummy like in DeleteRange + ScNoteCell* pNoteCell = new ScNoteCell; // Dummy like in DeleteRange // #121990# must iterate backwards, because indexes of following cells become invalid for (EntryPosPairs::reverse_iterator it( aEntries.rbegin()); @@ -1617,13 +1617,13 @@ void ScColumn::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW ScRange aRange( ScAddress( nCol1, nRow1, nTab1 ), ScAddress( nCol2, nRow2, nTab2 ) ); if ( eUpdateRefMode == URM_COPY && nRow1 == nRow2 ) - { // z.B. eine einzelne Zelle aus dem Clipboard eingefuegt + { // z.B. eine einzelne Zelle aus dem Clipboard eingefuegt SCSIZE nIndex; if ( Search( nRow1, nIndex ) ) { ScFormulaCell* pCell = (ScFormulaCell*) pItems[nIndex].pCell; if( pCell->GetCellType() == CELLTYPE_FORMULA) - pCell->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); + pCell->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); } } else @@ -1685,7 +1685,7 @@ void ScColumn::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->UpdateTranspose( rSource, rDest, pUndoDoc ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1702,7 +1702,7 @@ void ScColumn::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->UpdateGrow( rArea, nGrowX, nGrowY ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1728,7 +1728,7 @@ void ScColumn::UpdateInsertTabOnlyCells( SCTAB nTable) SCROW nRow = pItems[i].nRow; pCell->UpdateInsertTab(nTable); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1745,7 +1745,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nTable) SCROW nRow = pItems[i].nRow; pCell->UpdateInsertTabAbs(nTable); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1769,7 +1769,7 @@ void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo ) BOOL bChanged = pOld->UpdateDeleteTab(nTable, bIsMove); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? if (pRefUndo) { @@ -1795,7 +1795,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo ) SCROW nRow = pItems[i].nRow; pCell->UpdateMoveTab( nOldPos, nNewPos, nTabNo ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1812,7 +1812,7 @@ void ScColumn::UpdateCompile( BOOL bForceIfNameInUse ) SCROW nRow = pItems[i].nRow; p->UpdateCompile( bForceIfNameInUse ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1887,7 +1887,7 @@ void ScColumn::SetDirty() { // wird nur dokumentweit verwendet, kein FormulaTrack BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; iGetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCROW nRow2 = rRange.aEnd.Row(); ScAddress aPos( nCol, 0, nTab ); ScHint aHint( SC_HINT_DATACHANGED, aPos, NULL ); @@ -1936,7 +1936,7 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange ) if ( !pItems || !nCount ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // no multiple recalculation + pDocument->SetAutoCalc( FALSE ); // no multiple recalculation SCROW nRow2 = rRange.aEnd.Row(); ScAddress aPos( nCol, 0, nTab ); ScHint aHint( SC_HINT_TABLEOPDIRTY, aPos, NULL ); @@ -1963,7 +1963,7 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange ) void ScColumn::SetDirtyAfterLoad() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; iGetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; iGetCode()->IsRecalcModeNormal() ) nNewVal = pFCell->GetValue(); else - nNewVal = nOldVal; // random(), jetzt() etc. + nNewVal = nOldVal; // random(), jetzt() etc. DBG_ASSERT( nOldVal==nNewVal, "CalcAll: nOldVal != nNewVal" ); #endif } @@ -2049,7 +2049,7 @@ void ScColumn::CompileAll() ((ScFormulaCell*)pCell)->SetCompile( TRUE ); ((ScFormulaCell*)pCell)->CompileTokenArray(); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -2066,7 +2066,7 @@ void ScColumn::CompileXML( ScProgress& rProgress ) SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->CompileXML( rProgress ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -2103,7 +2103,7 @@ void ScColumn::ResetChanged( SCROW nStartRow, SCROW nEndRow ) BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const { - // used in GetOptimalHeight - ambiguous script type counts as edit cell + // used in GetOptimalHeight - ambiguous script type counts as edit cell SCROW nRow = 0; SCSIZE nIndex; @@ -2133,7 +2133,7 @@ SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, { if (rMark.IsMultiMarked()) return pAttrArray->SearchStyle( nRow, pSearchStyle, bUp, - (ScMarkArray*) rMark.GetArray()+nCol ); //! const + (ScMarkArray*) rMark.GetArray()+nCol ); //! const else return -1; } @@ -2149,7 +2149,7 @@ BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleShe { if (rMark.IsMultiMarked()) return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, - (ScMarkArray*) rMark.GetArray()+nCol ); //! const + (ScMarkArray*) rMark.GetArray()+nCol ); //! const else return FALSE; } diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 2adf6d926f0f..f585e5612334 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -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 @@ -63,7 +63,7 @@ #include "editutil.hxx" #include "subtotal.hxx" #include "markdata.hxx" -#include "compiler.hxx" // ScTokenArray GetCodeLen +#include "compiler.hxx" // ScTokenArray GetCodeLen #include "dbcolect.hxx" #include "fillinfo.hxx" #include "segmenttree.hxx" @@ -73,13 +73,13 @@ // ----------------------------------------------------------------------- // factor from font size to optimal cell height (text width) -#define SC_ROT_BREAK_FACTOR 6 +#define SC_ROT_BREAK_FACTOR 6 // ----------------------------------------------------------------------- inline BOOL IsAmbiguousScript( BYTE nScript ) { - //! move to a header file + //! move to a header file return ( nScript != SCRIPTTYPE_LATIN && nScript != SCRIPTTYPE_ASIAN && nScript != SCRIPTTYPE_COMPLEX ); @@ -88,7 +88,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript ) // ----------------------------------------------------------------------------------------- // -// Datei-Operationen +// Datei-Operationen // // ----------------------------------------------------------------------------------------- @@ -182,7 +182,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript ) // ----------------------------------------------------------------------------------------- - // GetNeededSize: optimale Hoehe / Breite in Pixeln + // GetNeededSize: optimale Hoehe / Breite in Pixeln long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -199,11 +199,11 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (!pPattern) pPattern = pAttrArray->GetPattern( nRow ); - // zusammengefasst? - // Merge nicht in bedingter Formatierung + // zusammengefasst? + // Merge nicht in bedingter Formatierung - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); + const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); if ( bWidth ) { @@ -220,12 +220,12 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, return 0; } - // bedingte Formatierung + // bedingte Formatierung const SfxItemSet* pCondSet = NULL; if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() ) pCondSet = pDocument->GetCondResult( nCol, nRow, nTab ); - // Zeilenumbruch? + // Zeilenumbruch? const SfxPoolItem* pCondItem; SvxCellHorJustify eHorJust; @@ -248,7 +248,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, // Cell has a value. Disable line break. bBreak = false; - // get other attributes from pattern and conditional formatting + // get other attributes from pattern and conditional formatting SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet ); BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED && @@ -256,7 +256,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bAsianVertical ) bBreak = false; - if ( bWidth && bBreak ) // after determining bAsianVertical (bBreak may be reset) + if ( bWidth && bBreak ) // after determining bAsianVertical (bBreak may be reset) return 0; long nRotate = 0; @@ -278,7 +278,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, pPattern->GetItem(ATTR_ROTATE_MODE)).GetValue(); if ( nRotate == 18000 ) - eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf + eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf } } @@ -309,8 +309,8 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell ); if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); - // also call SetFont for edit cells, because bGetFont may be set only once - // bGetFont is set also if script type changes + // also call SetFont for edit cells, because bGetFont may be set only once + // bGetFont is set also if script type changes if (rOptions.bGetFont) { Fraction aFontZoom = ( eOrient == SVX_ORIENTATION_STANDARD ) ? rZoomX : rZoomY; @@ -328,7 +328,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, IsAmbiguousScript( nScript ) || ((eCellType == CELLTYPE_FORMULA) && ((ScFormulaCell*)pCell)->IsMultilineResult()) ); - if (!bEditEngine) // direkte Ausgabe + if (!bEditEngine) // direkte Ausgabe { String aValStr; Color* pColor; @@ -339,7 +339,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, TRUE, rOptions.bFormula, ftCheck ); if (aValStr.Len()) { - // SetFont ist nach oben verschoben + // SetFont ist nach oben verschoben Size aSize( pDev->GetTextWidth( aValStr ), pDev->GetTextHeight() ); if ( eOrient != SVX_ORIENTATION_STANDARD ) @@ -350,9 +350,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, } else if ( nRotate ) { - //! unterschiedliche Skalierung X/Y beruecksichtigen + //! unterschiedliche Skalierung X/Y beruecksichtigen - double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad + double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad double nCosAbs = fabs( cos( nRealOrient ) ); double nSinAbs = fabs( sin( nRealOrient ) ); long nHeight = (long)( aSize.Height() * nCosAbs + aSize.Width() * nSinAbs ); @@ -363,18 +363,18 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, { nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT ); bAddMargin = FALSE; - // nur nach rechts: - //! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe) + // nur nach rechts: + //! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe) if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT ) nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) * nPPT * nCosAbs / nSinAbs ); } else - nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? + nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? if ( bBreak && !rOptions.bTotalSize ) { - // #47744# limit size for line break + // #47744# limit size for line break long nCmp = pDev->GetFont().GetSize().Height() * SC_ROT_BREAK_FACTOR; if ( nHeight > nCmp ) nHeight = nCmp; @@ -398,18 +398,18 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, (long) ( pMargin->GetBottomMargin() * nPPT ); } - // Zeilenumbruch ausgefuehrt ? + // Zeilenumbruch ausgefuehrt ? if ( bBreak && !bWidth ) { - // Test mit EditEngine zur Sicherheit schon bei 90% - // (wegen Rundungsfehlern und weil EditEngine teilweise anders formatiert) + // Test mit EditEngine zur Sicherheit schon bei 90% + // (wegen Rundungsfehlern und weil EditEngine teilweise anders formatiert) long nDocPixel = (long) ( ( pDocument->GetColWidth( nCol,nTab ) - pMargin->GetLeftMargin() - pMargin->GetRightMargin() - nIndent ) * nPPT ); - nDocPixel = (nDocPixel * 9) / 10; // zur Sicherheit + nDocPixel = (nDocPixel * 9) / 10; // zur Sicherheit if ( aSize.Width() > nDocPixel ) bEditEngine = TRUE; } @@ -418,7 +418,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (bEditEngine) { - // der Font wird bei !bEditEngine nicht jedesmal neu gesetzt + // der Font wird bei !bEditEngine nicht jedesmal neu gesetzt Font aOldFont = pDev->GetFont(); MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY ); @@ -436,8 +436,8 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, SfxItemSet* pSet = new SfxItemSet( pEngine->GetEmptyItemSet() ); pPattern->FillEditItemSet( pSet, pCondSet ); -// no longer needed, are setted with the text (is faster) -// pEngine->SetDefaults( pSet ); +// no longer needed, are setted with the text (is faster) +// pEngine->SetDefaults( pSet ); if ( ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { @@ -454,9 +454,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, BOOL bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER ); if ( bTextWysiwyg ) { - // #95593# if text is formatted for printer, don't use PixelToLogic, - // to ensure the exact same paper width (and same line breaks) as in - // ScEditUtil::GetEditArea, used for output. + // #95593# if text is formatted for printer, don't use PixelToLogic, + // to ensure the exact same paper width (and same line breaks) as in + // ScEditUtil::GetEditArea, used for output. fWidthFactor = HMM_PER_TWIPS; } @@ -469,7 +469,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nDocWidth += (long) ( pDocument->GetColWidth(nCol+nColAdd,nTab) * fWidthFactor ); nDocWidth -= (long) ( pMargin->GetLeftMargin() * fWidthFactor ) + (long) ( pMargin->GetRightMargin() * fWidthFactor ) - + 1; // Ausgabebereich ist Breite-1 Pixel (wegen Gitterlinien) + + 1; // Ausgabebereich ist Breite-1 Pixel (wegen Gitterlinien) if ( nIndent ) nDocWidth -= (long) ( nIndent * fWidthFactor ); @@ -514,10 +514,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, bEdWidth = !bEdWidth; if ( nRotate ) { - //! unterschiedliche Skalierung X/Y beruecksichtigen + //! unterschiedliche Skalierung X/Y beruecksichtigen Size aSize( pEngine->CalcTextWidth(), pEngine->GetTextHeight() ); - double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad + double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad double nCosAbs = fabs( cos( nRealOrient ) ); double nSinAbs = fabs( sin( nRealOrient ) ); long nHeight = (long)( aSize.Height() * nCosAbs + aSize.Width() * nSinAbs ); @@ -533,7 +533,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nPPT * nCosAbs / nSinAbs ); } else - nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? + nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? aSize = Size( nWidth, nHeight ); Size aPixSize = pDev->LogicToPixel( aSize, aHMMMode ); @@ -545,7 +545,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bBreak && !rOptions.bTotalSize ) { - // #47744# limit size for line break + // #47744# limit size for line break long nCmp = aOldFont.GetSize().Height() * SC_ROT_BREAK_FACTOR; if ( nValue > nCmp ) nValue = nCmp; @@ -560,7 +560,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nValue = pDev->LogicToPixel(Size( pEngine->CalcTextWidth(), 0 ), aHMMMode).Width(); } - else // Hoehe + else // Hoehe { nValue = pDev->LogicToPixel(Size( 0, pEngine->GetTextHeight() ), aHMMMode).Height(); @@ -582,13 +582,13 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bAsianVertical && pDev->GetOutDevType() != OUTDEV_PRINTER ) { - // add 1pt extra (default margin value) for line breaks with SetVertical + // add 1pt extra (default margin value) for line breaks with SetVertical nValue += (long) ( 20 * nPPT ); } } } - // EditEngine is cached and re-used, so the old vertical flag must be restored + // EditEngine is cached and re-used, so the old vertical flag must be restored pEngine->SetVertical( bEngineVertical ); pDocument->DisposeFieldEditEngine(pEngine); @@ -599,9 +599,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (bWidth) { - // Platz fuer Autofilter-Button - // 20 * nZoom/100 - // bedingte Formatierung hier nicht interessant + // Platz fuer Autofilter-Button + // 20 * nZoom/100 + // bedingte Formatierung hier nicht interessant INT16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue(); if (nFlags & SC_MF_AUTO) @@ -646,13 +646,13 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP if (nCount == 0) return nOldWidth; - USHORT nWidth = (USHORT) (nOldWidth * nPPTX); - BOOL bFound = FALSE; + USHORT nWidth = (USHORT) (nOldWidth * nPPTX); + BOOL bFound = FALSE; SCSIZE nIndex; ScMarkedDataIter aDataIter(this, pMarkData, TRUE); if ( bSimpleTextImport ) - { // alles eins bis auf NumberFormate + { // alles eins bis auf NumberFormate const ScPatternAttr* pPattern = GetPattern( 0 ); Font aFont; // font color doesn't matter here @@ -722,13 +722,13 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId USHORT nHeight = (USHORT) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight(); const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN); nHeight += nHeight / 5; - // gibt bei 10pt 240 + // gibt bei 10pt 240 if ( ((const SvxEmphasisMarkItem&)rPattern. GetItem(ATTR_FONT_EMPHASISMARK)).GetEmphasisMark() != EMPHASISMARK_NONE ) { - // add height for emphasis marks - //! font metrics should be used instead + // add height for emphasis marks + //! font metrics should be used instead nHeight += nHeight / 4; } @@ -738,8 +738,8 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId nHeight -= 240; } - // Standard-Hoehe: TextHeight + Raender - 23 - // -> 257 unter Windows + // Standard-Hoehe: TextHeight + Raender - 23 + // -> 257 unter Windows if (nHeight > STD_ROWHEIGHT_DIFF) nHeight -= STD_ROWHEIGHT_DIFF; @@ -749,9 +749,9 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId return nHeight; } -// pHeight in Twips -// nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight -// (wird nur bei bStdAllowed ausgewertet) +// pHeight in Twips +// nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight +// (wird nur bei bStdAllowed ausgewertet) void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, OutputDevice* pDev, @@ -766,18 +766,18 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight SCROW nEditPos = 0; SCROW nNextEnd = 0; - // bei bedingter Formatierung werden immer die einzelnen Zellen angesehen + // bei bedingter Formatierung werden immer die einzelnen Zellen angesehen const ScPatternAttr* pPattern = aIter.Next(nStart,nEnd); while ( pPattern ) { - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); + const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); if ( pMerge->GetRowMerge() > 1 || pFlag->IsOverlapped() ) { - // nix - vertikal bei der zusammengefassten und den ueberdeckten, - // horizontal nur bei den ueberdeckten (unsichtbaren) - - // eine nur horizontal zusammengefasste wird aber beruecksichtigt + // nix - vertikal bei der zusammengefassten und den ueberdeckten, + // horizontal nur bei den ueberdeckten (unsichtbaren) - + // eine nur horizontal zusammengefasste wird aber beruecksichtigt } else { @@ -804,20 +804,20 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight } if (bStdOnly) - if (HasEditCells(nStart,nEnd,nEditPos)) // includes mixed script types + if (HasEditCells(nStart,nEnd,nEditPos)) // includes mixed script types { if (nEditPos == nStart) { bStdOnly = FALSE; if (nEnd > nEditPos) nNextEnd = nEnd; - nEnd = nEditPos; // einzeln ausrechnen - bStdAllowed = FALSE; // wird auf jeden Fall per Zelle berechnet + nEnd = nEditPos; // einzeln ausrechnen + bStdAllowed = FALSE; // wird auf jeden Fall per Zelle berechnet } else { nNextEnd = nEnd; - nEnd = nEditPos - 1; // Standard - Teil + nEnd = nEditPos - 1; // Standard - Teil } } @@ -835,8 +835,8 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight else nDefHeight = nLatHeight = lcl_GetAttribHeight( *pPattern, ATTR_FONT_HEIGHT ); - // if everything below is already larger, the loop doesn't have to - // be run again + // if everything below is already larger, the loop doesn't have to + // be run again SCROW nStdEnd = nEnd; if ( nDefHeight <= nMinHeight && nStdEnd >= nMinStart ) nStdEnd = (nMinStart>0) ? nMinStart-1 : 0; @@ -847,8 +847,8 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight if ( bStdOnly ) { - // if cells are not handled individually below, - // check for cells with different script type + // if cells are not handled individually below, + // check for cells with different script type SCSIZE nIndex; Search(nStart,nIndex); @@ -884,7 +884,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight } } - if (!bStdOnly) // belegte Zellen suchen + if (!bStdOnly) // belegte Zellen suchen { ScNeededSizeOptions aOptions; @@ -892,7 +892,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight Search(nStart,nIndex); while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : FALSE ) { - // Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#) + // Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#) if ( bShrink || !(pDocument->GetRowFlags(nRow, nTab) & CR_MANUALSIZE) ) { @@ -983,27 +983,27 @@ void ScColumn::RemoveAutoSpellObj() { ScEditCell* pOldCell = (ScEditCell*) pItems[i].pCell; const EditTextObject* pData = pOldCell->GetData(); - // keine Abfrage auf HasOnlineSpellErrors, damit es auch - // nach dem Laden funktioniert + // keine Abfrage auf HasOnlineSpellErrors, damit es auch + // nach dem Laden funktioniert - // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults - // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche - // Attribute in Default und harter Formatierung erkennen und weglassen sollte, - // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt - // werden! + // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults + // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche + // Attribute in Default und harter Formatierung erkennen und weglassen sollte, + // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt + // werden! - // auf Attribute testen + // auf Attribute testen if ( !pEngine ) pEngine = new ScTabEditEngine(pDocument); pEngine->SetText( *pData ); ScEditAttrTester aTester( pEngine ); - if ( aTester.NeedsObject() ) // nur Spell-Errors entfernen + if ( aTester.NeedsObject() ) // nur Spell-Errors entfernen { - EditTextObject* pNewData = pEngine->CreateTextObject(); // ohne BIGOBJ + EditTextObject* pNewData = pEngine->CreateTextObject(); // ohne BIGOBJ pOldCell->SetData( pNewData, pEngine->GetEditTextObjectPool() ); delete pNewData; } - else // String erzeugen + else // String erzeugen { String aText = ScEditUtil::GetSpaceDelimitedString( *pEngine ); ScBaseCell* pNewCell = new ScStringCell( aText ); @@ -1029,18 +1029,18 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) ScEditCell* pOldCell = (ScEditCell*) pItems[i].pCell; const EditTextObject* pData = pOldCell->GetData(); - // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults - // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche - // Attribute in Default und harter Formatierung erkennen und weglassen sollte, - // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt - // werden! + // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults + // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche + // Attribute in Default und harter Formatierung erkennen und weglassen sollte, + // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt + // werden! - // auf Attribute testen + // auf Attribute testen if ( !pEngine ) { //pEngine = new ScTabEditEngine(pDocument); pEngine = new ScFieldEditEngine( pDocument->GetEditPool() ); - // EE_CNTRL_ONLINESPELLING falls schon Fehler drin sind + // EE_CNTRL_ONLINESPELLING falls schon Fehler drin sind pEngine->SetControlWord( pEngine->GetControlWord() | EE_CNTRL_ONLINESPELLING ); pEngine->SetForbiddenCharsTable( pDocument->GetForbiddenCharacters() ); pEngine->SetAsianCompressionMode( pDocument->GetAsianCompression() ); @@ -1054,18 +1054,18 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) const SfxItemSet& rOld = pEngine->GetParaAttribs( nPar ); if ( rOld.Count() ) { - SfxItemSet aNew( *rOld.GetPool(), rOld.GetRanges() ); // leer + SfxItemSet aNew( *rOld.GetPool(), rOld.GetRanges() ); // leer pEngine->SetParaAttribs( nPar, aNew ); } } - // URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0) + // URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0) pEngine->RemoveFields( TRUE ); BOOL bSpellErrors = pEngine->HasOnlineSpellErrors(); - BOOL bNeedObject = bSpellErrors || nParCount>1; // Errors/Absaetze behalten - // ScEditAttrTester nicht mehr noetig, Felder sind raus + BOOL bNeedObject = bSpellErrors || nParCount>1; // Errors/Absaetze behalten + // ScEditAttrTester nicht mehr noetig, Felder sind raus - if ( bNeedObject ) // bleibt Edit-Zelle + if ( bNeedObject ) // bleibt Edit-Zelle { ULONG nCtrl = pEngine->GetControlWord(); ULONG nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0; @@ -1075,7 +1075,7 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) pOldCell->SetData( pNewData, pEngine->GetEditTextObjectPool() ); delete pNewData; } - else // String erzeugen + else // String erzeugen { String aText = ScEditUtil::GetSpaceDelimitedString( *pEngine ); ScBaseCell* pNewCell = new ScStringCell( aText ); @@ -1134,9 +1134,9 @@ BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell ) return FALSE; } -SCSIZE ScColumnIterator::GetIndex() const // Index zur letzen abgefragten Zelle +SCSIZE ScColumnIterator::GetIndex() const // Index zur letzen abgefragten Zelle { - return nPos - 1; // bei Next ist Pos hochgezaehlt worden + return nPos - 1; // bei Next ist Pos hochgezaehlt worden } // ----------------------------------------------------------------------------------------- @@ -1166,17 +1166,17 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex ) { if (!pMarkIter || !pMarkIter->Next( nTop, nBottom )) { - if (bAll) // ganze Spalte + if (bAll) // ganze Spalte { - nTop = 0; - nBottom = MAXROW; + nTop = 0; + nBottom = MAXROW; } else return FALSE; } pColumn->Search( nTop, nPos ); bNext = FALSE; - bAll = FALSE; // nur beim ersten Versuch + bAll = FALSE; // nur beim ersten Versuch } if ( nPos >= pColumn->nCount ) @@ -1238,7 +1238,7 @@ BOOL ScColumn::IsEmptyVisData(BOOL bNotes) const SCSIZE ScColumn::VisibleCount( SCROW nStartRow, SCROW nEndRow ) const { - // Notizen werden nicht mitgezaehlt + // Notizen werden nicht mitgezaehlt SCSIZE nVisCount = 0; SCSIZE nIndex; @@ -1329,10 +1329,10 @@ BOOL ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) c while ( nIndex < nCount && pItems[nIndex].nRow <= nEndRow ) { if ( !pItems[nIndex].pCell->IsBlank( bIgnoreNotes ) ) // found a cell - return FALSE; // not empty + return FALSE; // not empty ++nIndex; } - return TRUE; // no cell found + return TRUE; // no cell found } SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const @@ -1408,11 +1408,11 @@ BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const return bFound; } -BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow +BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow { SCSIZE nIndex; if (Search( rRow, nIndex )) - ++nIndex; // next cell + ++nIndex; // next cell BOOL bMore = ( nIndex < nCount ); if ( bMore ) @@ -1500,11 +1500,11 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const BOOL ScColumn::HasDataAt(SCROW nRow) const { -/* SCSIZE nIndex; +/* SCSIZE nIndex; return Search( nRow, nIndex ); */ - // immer nur sichtbare interessant ? - //! dann HasVisibleDataAt raus + // immer nur sichtbare interessant ? + //! dann HasVisibleDataAt raus SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1650,11 +1650,11 @@ void ScColumn::EndListening( SvtListener& rLst, SCROW nRow ) pCell->DeleteBroadcaster(); } } -// else -// DBG_ERROR("ScColumn::EndListening - kein Broadcaster"); +// else +// DBG_ERROR("ScColumn::EndListening - kein Broadcaster"); } -// else -// DBG_ERROR("ScColumn::EndListening - keine Zelle"); +// else +// DBG_ERROR("ScColumn::EndListening - keine Zelle"); } void ScColumn::CompileDBFormula() @@ -1714,12 +1714,12 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) break; case CELLTYPE_FORMULA: { - if ( rData.eFunc != SUBTOTAL_FUNC_CNT2 ) // da interessiert's nicht + if ( rData.eFunc != SUBTOTAL_FUNC_CNT2 ) // da interessiert's nicht { ScFormulaCell* pFC = (ScFormulaCell*)pCell; if ( pFC->GetErrCode() ) { - if ( rData.eFunc != SUBTOTAL_FUNC_CNT ) // fuer Anzahl einfach weglassen + if ( rData.eFunc != SUBTOTAL_FUNC_CNT ) // fuer Anzahl einfach weglassen rData.bError = TRUE; } else if (pFC->IsValue()) @@ -1754,11 +1754,11 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) rData.bError = TRUE; } break; - case SUBTOTAL_FUNC_CNT: // nur Werte + case SUBTOTAL_FUNC_CNT: // nur Werte if (bVal) ++rData.nCount; break; - case SUBTOTAL_FUNC_CNT2: // alle + case SUBTOTAL_FUNC_CNT2: // alle if (bCell) ++rData.nCount; break; @@ -1780,7 +1780,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) } } -// Mehrfachselektion: +// Mehrfachselektion: void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, @@ -1798,7 +1798,7 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, } } -// bei bNoMarked die Mehrfachselektion weglassen +// bei bNoMarked die Mehrfachselektion weglassen void ScColumn::UpdateAreaFunction( ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow ) @@ -1819,7 +1819,7 @@ ULONG ScColumn::GetWeightedCount() const { ULONG nTotal = 0; - // Notizen werden nicht gezaehlt + // Notizen werden nicht gezaehlt for (SCSIZE i=0; iBroadcast( ScHint( SC_HINT_DYING, ScAddress( nCol, nRow, nTab ), pCell ) ); if ( SvtBroadcaster* pBC = pCell->ReleaseBroadcaster() ) @@ -223,7 +223,7 @@ void ScColumn::Delete( SCROW nRow ) memmove( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ColEntry) ); pItems[nCount].nRow = 0; pItems[nCount].pCell = NULL; - // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer! + // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer! } pCell->EndListeningTo( pDocument ); pCell->Delete(); @@ -235,7 +235,7 @@ void ScColumn::DeleteAtIndex( SCSIZE nIndex ) { ScBaseCell* pCell = pItems[nIndex].pCell; ScNoteCell* pNoteCell = new ScNoteCell; - pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret + pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret pDocument->Broadcast( ScHint( SC_HINT_DYING, ScAddress( nCol, pItems[nIndex].nRow, nTab ), pCell ) ); delete pNoteCell; @@ -275,7 +275,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden BOOL bFound=FALSE; SCROW nEndRow = nStartRow + nSize - 1; @@ -297,9 +297,9 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize ) if (pBC) { // gibt jetzt invalid reference, kein Aufruecken der direkten Referenzen -// MoveListeners( *pBC, nRow+nSize ); +// MoveListeners( *pBC, nRow+nSize ); pCell->DeleteBroadcaster(); - // in DeleteRange werden leere Broadcaster geloescht + // in DeleteRange werden leere Broadcaster geloescht } } if (bFound) @@ -549,10 +549,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFla void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag) { - // FreeAll darf hier nicht gerufen werden wegen Broadcastern + // FreeAll darf hier nicht gerufen werden wegen Broadcastern - // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum - // unterschieden werden kann (#47901#) + // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum + // unterschieden werden kann (#47901#) USHORT nContMask = IDF_CONTENTS; // IDF_NOCAPTIONS needs to be passed too, if IDF_NOTE is set @@ -590,7 +590,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag) RemoveEditAttribs( nStartRow, nEndRow ); } - // Attribute erst hier + // Attribute erst hier if ((nDelFlag & IDF_ATTRIB) == IDF_ATTRIB) pAttrArray->DeleteArea( nStartRow, nEndRow ); else if ((nDelFlag & IDF_ATTRIB) != 0) pAttrArray->DeleteHardAttr( nStartRow, nEndRow ); } @@ -603,8 +603,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r if (!nContFlags) return NULL; - // Testen, ob Zelle kopiert werden soll - // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern + // Testen, ob Zelle kopiert werden soll + // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern BOOL bMatch = FALSE; ScBaseCell* pCell = pItems[nIndex].pCell; @@ -630,8 +630,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r } break; case CELLTYPE_STRING: - case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break; - case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break; + case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break; + case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break; default: { // added to avoid warnings @@ -641,16 +641,16 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r return NULL; - // Referenz einsetzen + // Referenz einsetzen ScSingleRefData aRef; aRef.nCol = nCol; aRef.nRow = pItems[nIndex].nRow; aRef.nTab = nTab; - aRef.InitFlags(); // -> alles absolut + aRef.InitFlags(); // -> alles absolut aRef.SetFlag3D(TRUE); - //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist? - //! (bei TransposeClip ist die Zielposition noch nicht bekannt) + //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist? + //! (bei TransposeClip ist die Zielposition noch nicht bekannt) aRef.CalcRelFromAbs( rDestPos ); @@ -661,8 +661,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r } -// rColumn = Quelle -// nRow1, nRow2 = Zielposition +// rColumn = Quelle +// nRow1, nRow2 = Zielposition void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, @@ -672,8 +672,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, { if ( bSkipAttrForEmpty ) { - // copy only attributes for non-empty cells - // (notes are not counted as non-empty here, to match the content behavior) + // copy only attributes for non-empty cells + // (notes are not counted as non-empty here, to match the content behavior) SCSIZE nStartIndex; rColumn.Search( nRow1-nDy, nStartIndex ); @@ -685,7 +685,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, SCROW nStartRow = rColumn.pItems[nStartIndex].nRow; SCROW nEndRow = nStartRow; - // find consecutive non-empty cells + // find consecutive non-empty cells while ( nEndRow < nRow2-nDy && nEndIndex+1 < rColumn.nCount && @@ -709,25 +709,25 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, if ( bAsLink && nInsFlag == IDF_ALL ) { - // bei "alles" werden auch leere Zellen referenziert - //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen" - //! einzeln ausgewaehlt werden koennen! + // bei "alles" werden auch leere Zellen referenziert + //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen" + //! einzeln ausgewaehlt werden koennen! Resize( nCount + static_cast(nRow2-nRow1+1) ); - ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst + ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst - // Referenz erzeugen (Quell-Position) + // Referenz erzeugen (Quell-Position) ScSingleRefData aRef; aRef.nCol = rColumn.nCol; - // nRow wird angepasst + // nRow wird angepasst aRef.nTab = rColumn.nTab; - aRef.InitFlags(); // -> alles absolut + aRef.InitFlags(); // -> alles absolut aRef.SetFlag3D(TRUE); for (SCROW nDestRow = nRow1; nDestRow <= nRow2; nDestRow++) { - aRef.nRow = nDestRow - nDy; // Quell-Zeile + aRef.nRow = nDestRow - nDy; // Quell-Zeile aDestPos.SetRow( nDestRow ); aRef.CalcRelFromAbs( aDestPos ); @@ -763,8 +763,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, bAtEnd = TRUE; else if ( nDestRow >= (SCsROW) nRow1 ) { - // rows at the beginning may be skipped if filtered rows are left out, - // nDestRow may be negative then + // rows at the beginning may be skipped if filtered rows are left out, + // nDestRow may be negative then ScAddress aDestPos( nCol, (SCROW)nDestRow, nTab ); @@ -939,7 +939,7 @@ void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction, } -// Ergebnis in rVal1 +// Ergebnis in rVal1 BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction ) { @@ -950,7 +950,7 @@ BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction ) bOk = SubTotal::SafePlus( rVal1, nVal2 ); break; case PASTE_SUB: - nVal2 = -nVal2; //! geht das immer ohne Fehler? + nVal2 = -nVal2; //! geht das immer ohne Fehler? bOk = SubTotal::SafePlus( rVal1, nVal2 ); break; case PASTE_MUL: @@ -992,9 +992,9 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, SCSIZE nIndex; Search( nRow1, nIndex ); -// SCSIZE nSrcIndex = 0; +// SCSIZE nSrcIndex = 0; SCSIZE nSrcIndex; - rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne + rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne SCROW nNextThis = MAXROW+1; if ( nIndex < nCount ) @@ -1026,14 +1026,14 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, BOOL bSrcEmpty = ( eSrcType == CELLTYPE_NONE || eSrcType == CELLTYPE_NOTE ); BOOL bDestEmpty = ( eDestType == CELLTYPE_NONE || eDestType == CELLTYPE_NOTE ); - if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen + if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen { - if ( pSrc ) // war da eine Zelle? + if ( pSrc ) // war da eine Zelle? { pNew = pSrc->CloneWithoutNote( *pDocument ); } } - else if ( nFunction ) // wirklich Rechenfunktion angegeben + else if ( nFunction ) // wirklich Rechenfunktion angegeben { double nVal1; double nVal2; @@ -1046,7 +1046,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, else nVal2 = 0.0; - // leere Zellen werden als Werte behandelt + // leere Zellen werden als Werte behandelt BOOL bSrcVal = ( bSrcEmpty || eSrcType == CELLTYPE_VALUE ); BOOL bDestVal = ( bDestEmpty || eDestType == CELLTYPE_VALUE ); @@ -1056,15 +1056,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, BOOL bDestText = ( eDestType == CELLTYPE_STRING || eDestType == CELLTYPE_EDIT ); - // sonst bleibt nur Formel... + // sonst bleibt nur Formel... if ( bSrcEmpty && bDestEmpty ) { - // beide leer -> nix + // beide leer -> nix } else if ( bSrcVal && bDestVal ) { - // neuen Wert eintragen, oder Fehler bei Ueberlauf + // neuen Wert eintragen, oder Fehler bei Ueberlauf BOOL bOk = lcl_DoFunction( nVal1, nVal2, nFunction ); @@ -1075,15 +1075,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, ScFormulaCell* pFC = new ScFormulaCell( pDocument, ScAddress( nCol, nRow, nTab ) ); pFC->SetErrCode( errNoValue ); - //! oder NOVALUE, dann auch in consoli, - //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus - //! (dann geht Stringzelle+Wertzelle nicht mehr) + //! oder NOVALUE, dann auch in consoli, + //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus + //! (dann geht Stringzelle+Wertzelle nicht mehr) pNew = pFC; } } else if ( bSrcText || bDestText ) { - // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc + // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc if (pSrc) pNew = pSrc->CloneWithoutNote( *pDocument ); @@ -1092,28 +1092,28 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, } else { - // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen + // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen ScTokenArray aArr; - // erste Zelle + // erste Zelle if ( eSrcType == CELLTYPE_FORMULA ) lcl_AddCode( aArr, (ScFormulaCell*)pSrc ); else aArr.AddDouble( nVal1 ); - // Operator + // Operator OpCode eOp = ocAdd; switch ( nFunction ) { - case PASTE_ADD: eOp = ocAdd; break; - case PASTE_SUB: eOp = ocSub; break; - case PASTE_MUL: eOp = ocMul; break; - case PASTE_DIV: eOp = ocDiv; break; + case PASTE_ADD: eOp = ocAdd; break; + case PASTE_SUB: eOp = ocSub; break; + case PASTE_MUL: eOp = ocMul; break; + case PASTE_DIV: eOp = ocDiv; break; } - aArr.AddOpCode(eOp); // Funktion + aArr.AddOpCode(eOp); // Funktion - // zweite Zelle + // zweite Zelle if ( eDestType == CELLTYPE_FORMULA ) lcl_AddCode( aArr, (ScFormulaCell*)pDest ); else @@ -1124,21 +1124,21 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, } - if ( pNew || bDelete ) // neues Ergebnis ? + if ( pNew || bDelete ) // neues Ergebnis ? { - if (pDest && !pNew) // alte Zelle da ? + if (pDest && !pNew) // alte Zelle da ? { if ( pDest->GetBroadcaster() ) - pNew = new ScNoteCell; // Broadcaster uebernehmen + pNew = new ScNoteCell; // Broadcaster uebernehmen else - Delete(nRow); // -> loeschen + Delete(nRow); // -> loeschen } if (pNew) - Insert(nRow, pNew); // neue einfuegen + Insert(nRow, pNew); // neue einfuegen - Search( nRow, nIndex ); // alles kann sich verschoben haben + Search( nRow, nIndex ); // alles kann sich verschoben haben if (pNew) - nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow + nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow else nNextThis = ( nIndex < nCount ) ? pItems[nIndex].nRow : MAXROW+1; } @@ -1176,7 +1176,7 @@ void ScColumn::StartAllListeners() SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->StartListeningTo( pDocument ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener eingefuegt? + Search( nRow, i ); // Listener eingefuegt? } } } @@ -1197,7 +1197,7 @@ void ScColumn::StartNeededListeners() SCROW nRow = pItems[i].nRow; pFCell->StartListeningTo( pDocument ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener eingefuegt? + Search( nRow, i ); // Listener eingefuegt? } } } @@ -1239,14 +1239,14 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 ) if ( pCell->GetCellType() == CELLTYPE_FORMULA ) ((ScFormulaCell*)pCell)->StartListeningTo( pDocument ); if ( nRow != pItems[nIndex].nRow ) - Search( nRow, nIndex ); // durch Listening eingefuegt + Search( nRow, nIndex ); // durch Listening eingefuegt nIndex++; } } } -// TRUE = Zahlformat gesetzt +// TRUE = Zahlformat gesetzt BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, formula::FormulaGrammar::AddressConvention eConv, SvNumberFormatter* pLangFormatter, bool bDetectNumberFormat ) @@ -1277,24 +1277,24 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, && pFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT ) cFirstChar = rString.GetChar(0); else - cFirstChar = 0; // Text + cFirstChar = 0; // Text } else - { // waehrend ConvertFrom Import gibt es keine gesetzten Formate + { // waehrend ConvertFrom Import gibt es keine gesetzten Formate cFirstChar = rString.GetChar(0); } if ( cFirstChar == '=' ) { - if ( rString.Len() == 1 ) // = Text + if ( rString.Len() == 1 ) // = Text pNewCell = new ScStringCell( rString ); - else // =Formel + else // =Formel pNewCell = new ScFormulaCell( pDocument, ScAddress( nCol, nRow, nTabP ), rString, formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_DEFAULT, eConv), MM_NONE ); } - else if ( cFirstChar == '\'') // 'Text + else if ( cFirstChar == '\'') // 'Text pNewCell = new ScStringCell( rString.Copy(1) ); else { @@ -1319,7 +1319,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, if ( rString == aStr ) bIsText = TRUE; break; - case CELLTYPE_NOTE : // durch =Formel referenziert + case CELLTYPE_NOTE : // durch =Formel referenziert break; default: if ( i == nCount - 1 ) @@ -1399,7 +1399,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, const LocaleDataWrapper* pLocale = pLocaleSource->GetLocaleData(); if (!pLocale) break; - + LocaleDataItem aLocaleItem = pLocale->getLocaleItem(); const OUString& rDecSep = aLocaleItem.decimalSeparator; const OUString& rGroupSep = aLocaleItem.thousandSeparator; @@ -1423,7 +1423,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, } if ( bIsLoading && (!nCount || nRow > pItems[nCount-1].nRow) ) - { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen + { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen // und Broadcast kommt eh erst nach dem Laden if ( pNewCell ) Append( nRow, pNewCell ); @@ -1445,7 +1445,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, if (pBC) { pNewCell->TakeBroadcaster(pBC); - pLastFormulaTreeTop = 0; // Err527 Workaround + pLastFormulaTreeTop = 0; // Err527 Workaround } if ( pOldCell->GetCellType() == CELLTYPE_FORMULA ) @@ -1456,7 +1456,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, Search(nRow, i); } pOldCell->Delete(); - pItems[i].pCell = pNewCell; // ersetzen + pItems[i].pCell = pNewCell; // ersetzen if ( pNewCell->GetCellType() == CELLTYPE_FORMULA ) { pNewCell->StartListeningTo( pDocument ); @@ -1468,17 +1468,17 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, } else { - DeleteAtIndex(i); // loeschen und Broadcast + DeleteAtIndex(i); // loeschen und Broadcast } } else if (pNewCell) { - Insert(nRow, pNewCell); // neu eintragen und Broadcast + Insert(nRow, pNewCell); // neu eintragen und Broadcast } } - // hier keine Formate mehr fuer Formeln setzen! - // (werden bei der Ausgabe abgefragt) + // hier keine Formate mehr fuer Formeln setzen! + // (werden bei der Ausgabe abgefragt) } return bNumFmtSet; @@ -1497,9 +1497,9 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE ) { - ScBaseCell* pCell = pItems[nIndex].pCell; - TypedStrData* pData; - ULONG nFormat = GetNumberFormat( nRow ); + ScBaseCell* pCell = pItems[nIndex].pCell; + TypedStrData* pData; + ULONG nFormat = GetNumberFormat( nRow ); ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter ); @@ -1527,7 +1527,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec { short nType = pFormatter->GetType(nFormat); if ((nType & NUMBERFORMAT_DATE) && !(nType & NUMBERFORMAT_TIME)) - { + { // special case for date values. Disregard the time // element if the number format is of date type. nValue = ::rtl::math::approxFloor(nValue); @@ -1549,7 +1549,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec #endif if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt ++nIndex; } @@ -1558,13 +1558,13 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec } // -// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow +// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow // -// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe -// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen -#define DATENT_MAX 200 -#define DATENT_SEARCH 2000 +// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe +// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen +#define DATENT_MAX 200 +#define DATENT_SEARCH 2000 BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, BOOL bLimit) @@ -1575,23 +1575,23 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B String aString; USHORT nCells = 0; - // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt - // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen, - // damit naheliegende Zellen wenigstens zuerst gefunden werden. - //! Abstaende der Zeilennummern vergleichen? (Performance??) + // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt + // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen, + // damit naheliegende Zellen wenigstens zuerst gefunden werden. + //! Abstaende der Zeilennummern vergleichen? (Performance??) - SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle - SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle + SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle + SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle if (bThisUsed) - ++nDownIndex; // Startzelle ueberspringen + ++nDownIndex; // Startzelle ueberspringen while ( nUpIndex || nDownIndex < nCount ) { - if ( nUpIndex ) // nach oben + if ( nUpIndex ) // nach oben { ScBaseCell* pCell = pItems[nUpIndex-1].pCell; CellType eType = pCell->GetCellType(); - if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren + if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren { if (eType == CELLTYPE_STRING) ((ScStringCell*)pCell)->GetString(aString); @@ -1600,23 +1600,23 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B TypedStrData* pData = new TypedStrData(aString); if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt else if ( bLimit && rStrings.GetCount() >= DATENT_MAX ) - break; // Maximum erreicht + break; // Maximum erreicht bFound = TRUE; if ( bLimit ) if (++nCells >= DATENT_SEARCH) - break; // genug gesucht + break; // genug gesucht } --nUpIndex; } - if ( nDownIndex < nCount ) // nach unten + if ( nDownIndex < nCount ) // nach unten { ScBaseCell* pCell = pItems[nDownIndex].pCell; CellType eType = pCell->GetCellType(); - if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren + if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren { if (eType == CELLTYPE_STRING) ((ScStringCell*)pCell)->GetString(aString); @@ -1625,14 +1625,14 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B TypedStrData* pData = new TypedStrData(aString); if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt else if ( bLimit && rStrings.GetCount() >= DATENT_MAX ) - break; // Maximum erreicht + break; // Maximum erreicht bFound = TRUE; if ( bLimit ) if (++nCells >= DATENT_SEARCH) - break; // genug gesucht + break; // genug gesucht } ++nDownIndex; } @@ -1711,7 +1711,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal) void ScColumn::GetString( SCROW nRow, String& rString ) const { - SCSIZE nIndex; + SCSIZE nIndex; Color* pColor; if (Search(nRow, nIndex)) { @@ -1731,7 +1731,7 @@ void ScColumn::GetString( SCROW nRow, String& rString ) const void ScColumn::GetInputString( SCROW nRow, String& rString ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1750,7 +1750,7 @@ void ScColumn::GetInputString( SCROW nRow, String& rString ) const double ScColumn::GetValue( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1778,7 +1778,7 @@ double ScColumn::GetValue( SCROW nRow ) const void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1794,7 +1794,7 @@ void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const CellType ScColumn::GetCellType( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return pItems[nIndex].pCell->GetCellType(); return CELLTYPE_NONE; @@ -1803,7 +1803,7 @@ CellType ScColumn::GetCellType( SCROW nRow ) const USHORT ScColumn::GetErrCode( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1816,7 +1816,7 @@ USHORT ScColumn::GetErrCode( SCROW nRow ) const BOOL ScColumn::HasStringData( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return (pItems[nIndex].pCell)->HasStringData(); return FALSE; @@ -1825,7 +1825,7 @@ BOOL ScColumn::HasStringData( SCROW nRow ) const BOOL ScColumn::HasValueData( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return (pItems[nIndex].pCell)->HasValueData(); return FALSE; @@ -1833,7 +1833,7 @@ BOOL ScColumn::HasValueData( SCROW nRow ) const BOOL ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const { - // TRUE, wenn String- oder Editzellen im Bereich + // TRUE, wenn String- oder Editzellen im Bereich if ( pItems ) { @@ -1938,7 +1938,7 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh } -xub_StrLen ScColumn::GetMaxNumberStringLen( +xub_StrLen ScColumn::GetMaxNumberStringLen( sal_uInt16& nPrecision, SCROW nRowStart, SCROW nRowEnd ) const { xub_StrLen nStringLen = 0; diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index 95da04fef0e0..00c4adf54dea 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -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 @@ -362,7 +362,7 @@ A ScCompressedArray::GetLastUnequalAccess( A nStart, const D& rCompare ) } -// === ScSummableCompressedArray ============================================= +// === ScSummableCompressedArray ============================================= template< typename A, typename D > unsigned long ScSummableCompressedArray::SumValues( A nStart, A nEnd ) const diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index b08838198477..56774ab29339 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -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 @@ -144,14 +144,14 @@ ScConditionEntry::ScConditionEntry( const ScConditionEntry& r ) : bRelRef2(r.bRelRef2), bFirstRun(TRUE) { - // ScTokenArray copy ctor erzeugt flache Kopie + // ScTokenArray copy ctor erzeugt flache Kopie if (r.pFormula1) pFormula1 = new ScTokenArray( *r.pFormula1 ); if (r.pFormula2) pFormula2 = new ScTokenArray( *r.pFormula2 ); - // Formelzellen werden erst bei IsValid angelegt + // Formelzellen werden erst bei IsValid angelegt } ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r ) : @@ -185,8 +185,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr if (r.pFormula2) pFormula2 = r.pFormula2->Clone(); - // Formelzellen werden erst bei IsValid angelegt - //! im Clipboard nicht - dann vorher interpretieren !!! + // Formelzellen werden erst bei IsValid angelegt + //! im Clipboard nicht - dann vorher interpretieren !!! } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, @@ -194,7 +194,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, const String& rExprNmsp1, const String& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : eOp(eOper), - nOptions(0), // spaeter... + nOptions(0), // spaeter... nVal1(0.0), nVal2(0.0), aStrNmsp1(rExprNmsp1), @@ -215,14 +215,14 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, { Compile( rExpr1, rExpr2, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2, FALSE ); - // Formelzellen werden erst bei IsValid angelegt + // Formelzellen werden erst bei IsValid angelegt } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos ) : eOp(eOper), - nOptions(0), // spaeter... + nOptions(0), // spaeter... nVal1(0.0), nVal2(0.0), eTempGrammar1(FormulaGrammar::GRAM_DEFAULT), @@ -251,13 +251,13 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, if ( pToken->GetType() == svDouble ) { nVal1 = pToken->GetDouble(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr1 = TRUE; aStrVal1 = pToken->GetString(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } } } @@ -275,20 +275,20 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, if ( pToken->GetType() == svDouble ) { nVal2 = pToken->GetDouble(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr2 = TRUE; aStrVal2 = pToken->GetString(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } } } bRelRef2 = lcl_HasRelRef( pDoc, pFormula2 ); } - // formula cells are created at IsValid + // formula cells are created at IsValid } ScConditionEntry::~ScConditionEntry() @@ -313,8 +313,8 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, aComp.SetGrammar( eGrammar1 ); if ( pDoc->IsImportingXML() && !bTextToReal ) { - // temporary formula string as string tokens - //! merge with lcl_ScDocFunc_CreateTokenArrayXML + // temporary formula string as string tokens + //! merge with lcl_ScDocFunc_CreateTokenArrayXML pFormula1 = new ScTokenArray; pFormula1->AddString( rExpr1 ); // bRelRef1 is set when the formula is compiled again (CompileXML) @@ -331,13 +331,13 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, if ( pToken->GetType() == svDouble ) { nVal1 = pToken->GetDouble(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr1 = TRUE; aStrVal1 = pToken->GetString(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } } } @@ -350,8 +350,8 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, aComp.SetGrammar( eGrammar2 ); if ( pDoc->IsImportingXML() && !bTextToReal ) { - // temporary formula string as string tokens - //! merge with lcl_ScDocFunc_CreateTokenArrayXML + // temporary formula string as string tokens + //! merge with lcl_ScDocFunc_CreateTokenArrayXML pFormula2 = new ScTokenArray; pFormula2->AddString( rExpr2 ); // bRelRef2 is set when the formula is compiled again (CompileXML) @@ -368,13 +368,13 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, if ( pToken->GetType() == svDouble ) { nVal2 = pToken->GetDouble(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr2 = TRUE; aStrVal2 = pToken->GetString(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } } } @@ -384,9 +384,9 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, } } -void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzellen anlegen +void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzellen anlegen { - if ( !pDoc->IsClipOrUndo() ) // nie im Clipboard rechnen! + if ( !pDoc->IsClipOrUndo() ) // nie im Clipboard rechnen! { if ( pFormula1 && !pFCell1 && !bRelRef1 ) { @@ -404,8 +404,8 @@ void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzel void ScConditionEntry::SetIgnoreBlank(BOOL bSet) { - // Das Bit SC_COND_NOBLANKS wird gesetzt, wenn Blanks nicht ignoriert werden - // (nur bei Gueltigkeit) + // Das Bit SC_COND_NOBLANKS wird gesetzt, wenn Blanks nicht ignoriert werden + // (nur bei Gueltigkeit) if (bSet) nOptions &= ~SC_COND_NOBLANKS; @@ -415,7 +415,7 @@ void ScConditionEntry::SetIgnoreBlank(BOOL bSet) void ScConditionEntry::CompileAll() { - // Formelzellen loeschen, dann wird beim naechsten IsValid neu kompiliert + // Formelzellen loeschen, dann wird beim naechsten IsValid neu kompiliert DELETEZ(pFCell1); DELETEZ(pFCell2); @@ -436,7 +436,7 @@ void ScConditionEntry::CompileXML() aSrcString.Erase(); } - // Convert the text tokens that were created during XML import into real tokens. + // Convert the text tokens that were created during XML import into real tokens. Compile( GetExpression(aSrcPos, 0, 0, eTempGrammar1), GetExpression(aSrcPos, 1, 0, eTempGrammar2), @@ -526,7 +526,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode, } if (bChanged1) - DELETEZ(pFCell1); // is created again in IsValid + DELETEZ(pFCell1); // is created again in IsValid } if (pFormula2) { @@ -543,7 +543,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode, } if (bChanged2) - DELETEZ(pFCell2); // is created again in IsValid + DELETEZ(pFCell2); // is created again in IsValid } } @@ -565,11 +565,11 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) } } -//! als Vergleichsoperator ans TokenArray ??? +//! als Vergleichsoperator ans TokenArray ??? BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) { - // verglichen wird nur das nicht-UPN Array + // verglichen wird nur das nicht-UPN Array if ( pArr1 && pArr2 ) { @@ -583,12 +583,12 @@ BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) { if ( ppToken1[i] != ppToken2[i] && !(*ppToken1[i] == *ppToken2[i]) ) - return FALSE; // Unterschied + return FALSE; // Unterschied } - return TRUE; // alle Eintraege gleich + return TRUE; // alle Eintraege gleich } else - return !pArr1 && !pArr2; // beide 0 -> gleich + return !pArr1 && !pArr2; // beide 0 -> gleich } int ScConditionEntry::operator== ( const ScConditionEntry& r ) const @@ -603,7 +603,7 @@ int ScConditionEntry::operator== ( const ScConditionEntry& r ) const if ( ( pFormula1 || pFormula2 ) && ( aSrcPos != r.aSrcPos || aSrcString != r.aSrcString ) ) bEq = FALSE; - // wenn keine Formeln, Werte vergleichen + // wenn keine Formeln, Werte vergleichen if ( !pFormula1 && ( nVal1 != r.nVal1 || aStrVal1 != r.aStrVal1 || bIsStr1 != r.bIsStr1 ) ) bEq = FALSE; if ( !pFormula2 && ( nVal2 != r.nVal2 || aStrVal2 != r.aStrVal2 || bIsStr2 != r.bIsStr2 ) ) @@ -615,28 +615,28 @@ int ScConditionEntry::operator== ( const ScConditionEntry& r ) const void ScConditionEntry::Interpret( const ScAddress& rPos ) { - // Formelzellen anlegen - // dabei koennen neue Broadcaster (Note-Zellen) ins Dokument eingefuegt werden !!!! + // Formelzellen anlegen + // dabei koennen neue Broadcaster (Note-Zellen) ins Dokument eingefuegt werden !!!! if ( ( pFormula1 && !pFCell1 ) || ( pFormula2 && !pFCell2 ) ) MakeCells( rPos ); - // Formeln auswerten + // Formeln auswerten - BOOL bDirty = FALSE; //! 1 und 2 getrennt ??? + BOOL bDirty = FALSE; //! 1 und 2 getrennt ??? ScFormulaCell* pTemp1 = NULL; ScFormulaCell* pEff1 = pFCell1; if ( bRelRef1 ) { - pTemp1 = new ScFormulaCell( pDoc, rPos, pFormula1 ); // ohne Listening + pTemp1 = new ScFormulaCell( pDoc, rPos, pFormula1 ); // ohne Listening pEff1 = pTemp1; } if ( pEff1 ) { - if (!pEff1->IsRunning()) // keine 522 erzeugen + if (!pEff1->IsRunning()) // keine 522 erzeugen { - //! Changed statt Dirty abfragen !!! + //! Changed statt Dirty abfragen !!! if (pEff1->GetDirty() && !bRelRef1) bDirty = TRUE; if (pEff1->IsValue()) @@ -659,12 +659,12 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) ScFormulaCell* pEff2 = pFCell2; //@ 1!=2 if ( bRelRef2 ) { - pTemp2 = new ScFormulaCell( pDoc, rPos, pFormula2 ); // ohne Listening + pTemp2 = new ScFormulaCell( pDoc, rPos, pFormula2 ); // ohne Listening pEff2 = pTemp2; } if ( pEff2 ) { - if (!pEff2->IsRunning()) // keine 522 erzeugen + if (!pEff2->IsRunning()) // keine 522 erzeugen { if (pEff2->GetDirty() && !bRelRef2) bDirty = TRUE; @@ -684,13 +684,13 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) } delete pTemp2; - // wenn IsRunning, bleiben die letzten Werte erhalten + // wenn IsRunning, bleiben die letzten Werte erhalten if (bDirty && !bFirstRun) { - // bei bedingten Formaten neu painten + // bei bedingten Formaten neu painten - DataChanged( NULL ); // alles + DataChanged( NULL ); // alles } bFirstRun = FALSE; @@ -698,7 +698,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) BOOL ScConditionEntry::IsValid( double nArg ) const { - // Interpret muss schon gerufen sein + // Interpret muss schon gerufen sein if ( bIsStr1 ) { @@ -711,23 +711,23 @@ BOOL ScConditionEntry::IsValid( double nArg ) const if ( bIsStr2 ) return FALSE; - double nComp1 = nVal1; // Kopie, damit vertauscht werden kann + double nComp1 = nVal1; // Kopie, damit vertauscht werden kann double nComp2 = nVal2; if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( nComp1 > nComp2 ) { - // richtige Reihenfolge fuer Wertebereich + // richtige Reihenfolge fuer Wertebereich double nTemp = nComp1; nComp1 = nComp2; nComp2 = nTemp; } - // Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden! + // Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden! BOOL bValid = FALSE; switch (eOp) { case SC_COND_NONE: - break; // immer FALSE; + break; // immer FALSE; case SC_COND_EQUAL: bValid = ::rtl::math::approxEqual( nArg, nComp1 ); break; @@ -766,12 +766,12 @@ BOOL ScConditionEntry::IsValid( double nArg ) const BOOL ScConditionEntry::IsValidStr( const String& rArg ) const { - // Interpret muss schon gerufen sein + // Interpret muss schon gerufen sein - if ( eOp == SC_COND_DIRECT ) // Formel ist unabhaengig vom Inhalt + if ( eOp == SC_COND_DIRECT ) // Formel ist unabhaengig vom Inhalt return !::rtl::math::approxEqual( nVal1, 0.0 ); - // Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich" + // Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich" if ( !bIsStr1 ) return ( eOp == SC_COND_NOTEQUAL ); @@ -779,14 +779,14 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const if ( !bIsStr2 ) return FALSE; - String aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) + String aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) String aUpVal2( aStrVal2 ); if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 ) == COMPARE_GREATER ) { - // richtige Reihenfolge fuer Wertebereich + // richtige Reihenfolge fuer Wertebereich String aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; } @@ -821,14 +821,14 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const break; case SC_COND_BETWEEN: case SC_COND_NOTBETWEEN: - // Test auf NOTBETWEEN: + // Test auf NOTBETWEEN: bValid = ( nCompare == COMPARE_LESS || ScGlobal::GetCollator()->compareString( rArg, aUpVal2 ) == COMPARE_GREATER ); if ( eOp == SC_COND_BETWEEN ) bValid = !bValid; break; - // SC_COND_DIRECT schon oben abgefragt + // SC_COND_DIRECT schon oben abgefragt default: DBG_ERROR("unbekannte Operation bei ScConditionEntry"); bValid = FALSE; @@ -841,7 +841,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const { - ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten + ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten double nArg = 0.0; String aArgStr; @@ -875,14 +875,14 @@ BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) c break; default: - pCell = NULL; // Note-Zellen wie leere + pCell = NULL; // Note-Zellen wie leere break; } } if (!pCell) if (bIsStr1) - bVal = FALSE; // leere Zellen je nach Bedingung + bVal = FALSE; // leere Zellen je nach Bedingung if (bVal) return IsValid( nArg ); @@ -995,7 +995,7 @@ void ScConditionEntry::SourceChanged( const ScAddress& rChanged ) if ( aProv.Ref1.IsColRel() || aProv.Ref1.IsRowRel() || aProv.Ref1.IsTabRel() || aProv.Ref2.IsColRel() || aProv.Ref2.IsRowRel() || aProv.Ref2.IsTabRel() ) { - // absolut muss getroffen sein, relativ bestimmt Bereich + // absolut muss getroffen sein, relativ bestimmt Bereich BOOL bHit = TRUE; SCsCOL nCol1; @@ -1051,11 +1051,11 @@ void ScConditionEntry::SourceChanged( const ScAddress& rChanged ) if ( bHit ) { - //! begrenzen + //! begrenzen ScRange aPaint( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ); - // kein Paint, wenn es nur die Zelle selber ist + // kein Paint, wenn es nur die Zelle selber ist if ( aPaint.aStart != rChanged || aPaint.aEnd != rChanged ) DataChanged( &aPaint ); } @@ -1176,7 +1176,7 @@ int ScCondFormatEntry::operator== ( const ScCondFormatEntry& r ) const return ScConditionEntry::operator==( r ) && aStyleName == r.aStyleName; - // Range wird nicht verglichen + // Range wird nicht verglichen } ScCondFormatEntry::~ScCondFormatEntry() @@ -1247,7 +1247,7 @@ BOOL ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const if ( nEntryCount != r.nEntryCount ) return FALSE; - //! auf gleiche Eintraege in anderer Reihenfolge testen ??? + //! auf gleiche Eintraege in anderer Reihenfolge testen ??? for (USHORT i=0; i 0) --nStartCol; - if (nStartRow > 0) --nStartRow; + if (nStartCol > 0) --nStartCol; + if (nStartRow > 0) --nStartRow; if (nEndCol < MAXCOL) ++nEndCol; if (nEndRow < MAXROW) ++nEndRow; } @@ -1350,7 +1350,7 @@ BOOL lcl_CutRange( ScRange& rRange, const ScRange& rOther ) return TRUE; } - return FALSE; // ausserhalb + return FALSE; // ausserhalb } void ScConditionalFormat::DoRepaint( const ScRange* pModified ) @@ -1359,13 +1359,13 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified ) SfxObjectShell* pSh = pDoc->GetDocumentShell(); if (pSh) { - // Rahmen/Schatten enthalten? - // (alle Bedingungen testen) + // Rahmen/Schatten enthalten? + // (alle Bedingungen testen) BOOL bExtend = FALSE; BOOL bRotate = FALSE; BOOL bAttrTested = FALSE; - if (!pAreas) // RangeList ggf. holen + if (!pAreas) // RangeList ggf. holen { pAreas = new ScRangeList; pDoc->FindConditionalFormat( nKey, *pAreas ); @@ -1413,11 +1413,11 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified ) bAttrTested = TRUE; } - lcl_Extend( aRange, pDoc, bExtend ); // zusammengefasste und bExtend + lcl_Extend( aRange, pDoc, bExtend ); // zusammengefasste und bExtend if ( bRotate ) { aRange.aStart.SetCol(0); - aRange.aEnd.SetCol(MAXCOL); // gedreht: ganze Zeilen + aRange.aEnd.SetCol(MAXCOL); // gedreht: ganze Zeilen } // gedreht -> ganze Zeilen @@ -1462,7 +1462,7 @@ void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode, for (USHORT i=0; iUpdateReference(eUpdateRefMode, rRange, nDx, nDy, nDz); - delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf + delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf pAreas = NULL; } @@ -1478,7 +1478,7 @@ void ScConditionalFormat::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) for (USHORT i=0; iUpdateMoveTab( nOldPos, nNewPos ); - delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf + delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf pAreas = NULL; } @@ -1501,27 +1501,27 @@ bool ScConditionalFormat::MarkUsedExternalReferences() const ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList) : ScConditionalFormats_Impl() { - // fuer Ref-Undo - echte Kopie mit neuen Tokens! + // fuer Ref-Undo - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; iClone() ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } ScConditionalFormatList::ScConditionalFormatList(ScDocument* pNewDoc, const ScConditionalFormatList& rList) { - // fuer neues Dokument - echte Kopie mit neuen Tokens! + // fuer neues Dokument - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; iClone(pNewDoc) ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const @@ -1530,8 +1530,8 @@ BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) con USHORT nCount = Count(); BOOL bEqual = ( nCount == r.Count() ); - for (USHORT i=0; iEqualEntries(*r[i]) ) // Eintraege unterschiedlich ? + for (USHORT i=0; iEqualEntries(*r[i]) ) // Eintraege unterschiedlich ? bEqual = FALSE; return bEqual; @@ -1539,7 +1539,7 @@ BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) con ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey ) { - //! binaer suchen + //! binaer suchen USHORT nCount = Count(); for (USHORT i=0; iGetFormatTable()->GetStandardFormat( NUMBERFORMAT_LOGICAL, ScGlobal::eLnge ); nVal = (xRow->getBoolean(nRowPos) ? 1 : 0); @@ -85,7 +85,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB case sdbc::DataType::DOUBLE: case sdbc::DataType::NUMERIC: case sdbc::DataType::DECIMAL: - //! do the conversion here? + //! do the conversion here? nVal = xRow->getDouble(nRowPos); bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull(); bValue = TRUE; @@ -150,7 +150,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB case sdbc::DataType::VARBINARY: case sdbc::DataType::LONGVARBINARY: default: - bError = TRUE; // unknown type + bError = TRUE; // unknown type } } catch ( uno::Exception& ) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index aa5b011da93b..1da04e90b99d 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -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 @@ -88,7 +88,7 @@ ScDocumentIterator::~ScDocumentIterator() BOOL ScDocumentIterator::GetThisCol() { - ScTable* pTab; + ScTable* pTab; while ( (pTab = pDoc->pTab[nTab]) == NULL ) { if ( nTab == nEndTab ) @@ -99,8 +99,8 @@ BOOL ScDocumentIterator::GetThisCol() } ++nTab; } - ScColumn* pCol = &pTab->aCol[nCol]; - ScAttrArray* pAtt = pCol->pAttrArray; + ScColumn* pCol = &pTab->aCol[nCol]; + ScAttrArray* pAtt = pCol->pAttrArray; BOOL bFound = FALSE; do @@ -126,8 +126,8 @@ BOOL ScDocumentIterator::GetThisCol() if (nColRow == nRow) { - bFound = TRUE; - pCell = pCol->pItems[nColPos].pCell; + bFound = TRUE; + pCell = pCol->pItems[nColPos].pCell; pPattern = pAtt->pData[nAttrPos].pPattern; } else if ( pAtt->pData[nAttrPos].pPattern != pDefPattern ) @@ -225,7 +225,7 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, if ( rpArr != pNewArr || nAttrEndRow < nRow ) { SCSIZE nPos; - pNewArr->Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden + pNewArr->Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden const ScPatternAttr* pPattern = pNewArr->pData[nPos].pPattern; nFormat = pPattern->GetNumberFormat( pDoc->GetFormatTable() ); rpArr = pNewArr; @@ -306,9 +306,9 @@ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange, nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } @@ -332,7 +332,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) { // rValue = 0.0; //! do not change caller's value! rErr = 0; - return FALSE; // Ende und Aus + return FALSE; // Ende und Aus } } pCol = &(pDoc->pTab[nTab])->aCol[nCol]; @@ -365,8 +365,8 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) rValue = pDoc->RoundValueAsShown( rValue, nNumFormat ); } // - // wenn in der selben Spalte gleich noch eine Value-Cell folgt, die - // auch noch im Block liegt, den Wert jetzt schon holen + // wenn in der selben Spalte gleich noch eine Value-Cell folgt, die + // auch noch im Block liegt, den Wert jetzt schon holen // if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow && @@ -384,7 +384,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) } } - return TRUE; // gefunden + return TRUE; // gefunden } // break; case CELLTYPE_FORMULA: @@ -397,7 +397,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) rValue = ((ScFormulaCell*)pCell)->GetValue(); nRow--; bNumValid = FALSE; - return TRUE; // gefunden + return TRUE; // gefunden } else if ( bTextAsZero ) { @@ -432,7 +432,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) } } else - nRow = nEndRow + 1; // naechste Spalte + nRow = nEndRow + 1; // naechste Spalte } } @@ -475,18 +475,18 @@ BOOL ScValueIterator::GetFirst(double& rValue, USHORT& rErr) nRow = nStartRow; nTab = nStartTab; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; return GetThis(rValue, rErr); } -/* ist inline: +/* ist inline: BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr) { ++nRow; @@ -539,7 +539,7 @@ SCSIZE ScDBQueryDataIterator::SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, // ---------------------------------------------------------------------------- ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) : - DataAccess(pParent), + DataAccess(pParent), mpParam(pParam), mpDoc(pDoc) { @@ -547,7 +547,7 @@ ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat nRow = mpParam->nRow1; nTab = mpParam->nTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert SCSIZE i; SCSIZE nCount = mpParam->GetEntryCount(); for (i=0; (iGetEntry(i).bDoQuery); i++) @@ -557,7 +557,7 @@ ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat rEntry.bQueryByString = !(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal)); } - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } @@ -604,7 +604,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) rValue.mbIsNumber = true; if ( bCalcAsShown ) { - const ScAttrArray* pNewAttrArray = + const ScAttrArray* pNewAttrArray = ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol); lcl_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pNewAttrArray, nRow, mpDoc ); @@ -613,7 +613,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtType = NUMBERFORMAT_NUMBER; nNumFmtIndex = 0; rValue.mnError = 0; - return TRUE; // gefunden + return TRUE; // gefunden } // break; case CELLTYPE_FORMULA: @@ -626,7 +626,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtIndex, ScAddress( nCol, nRow, nTab ), pCell ); rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); - return TRUE; // gefunden + return TRUE; // gefunden } else nRow++; @@ -774,7 +774,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM vector aResults; aResults.reserve(nEntryCount); - const CollatorWrapper& rCollator = + const CollatorWrapper& rCollator = mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator(); for (SCSIZE i = 0; i < nEntryCount; ++i) @@ -895,7 +895,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM else if (rEntry.eConnect == SC_AND) { // For AND op, tuck the result into the last result value. - size_t n = aResults.size(); + size_t n = aResults.size(); aResults[n-1] = aResults[n-1] && bValid; } else @@ -978,21 +978,21 @@ ScCellIterator::ScCellIterator( ScDocument* pDocument, if (!ValidTab(nEndTab)) nEndTab = MAXTAB; while (nEndTab>0 && !pDoc->pTab[nEndTab]) - --nEndTab; // nur benutzte Tabellen + --nEndTab; // nur benutzte Tabellen if (nStartTab>nEndTab) nStartTab = nEndTab; nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert if (!pDoc->pTab[nTab]) { DBG_ERROR("Tabelle nicht gefunden"); nStartCol = nCol = MAXCOL+1; nStartRow = nRow = MAXROW+1; - nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst + nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst } } @@ -1020,21 +1020,21 @@ ScCellIterator::ScCellIterator if (!ValidTab(nEndTab)) nEndTab = MAXTAB; while (nEndTab>0 && !pDoc->pTab[nEndTab]) - --nEndTab; // nur benutzte Tabellen + --nEndTab; // nur benutzte Tabellen if (nStartTab>nEndTab) nStartTab = nEndTab; nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert if (!pDoc->pTab[nTab]) { DBG_ERROR("Tabelle nicht gefunden"); nStartCol = nCol = MAXCOL+1; nStartRow = nRow = MAXROW+1; - nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst + nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst } } @@ -1054,7 +1054,7 @@ ScBaseCell* ScCellIterator::GetThis() nCol = nStartCol; nTab++; if ( nTab > nEndTab ) - return NULL; // Ende und Aus + return NULL; // Ende und Aus } pCol = &(pDoc->pTab[nTab])->aCol[nCol]; } while ( pCol->nCount == 0 ); @@ -1064,7 +1064,7 @@ ScBaseCell* ScCellIterator::GetThis() while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) ) nColRow++; - if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) + if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) { nRow = pCol->pItems[nColRow].nRow; if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow ) ) @@ -1073,9 +1073,9 @@ ScBaseCell* ScCellIterator::GetThis() if ( bSubTotal && pCell->GetCellType() == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell)->IsSubTotal() ) - nRow++; // Sub-Total-Zeilen nicht + nRow++; // Sub-Total-Zeilen nicht else - return pCell; // gefunden + return pCell; // gefunden } else nRow++; @@ -1092,7 +1092,7 @@ ScBaseCell* ScCellIterator::GetFirst() nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); return GetThis(); @@ -1118,9 +1118,9 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, { nCol = aParam.nCol1; nRow = aParam.nRow1; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert SCSIZE i; - if (bMod) // sonst schon eingetragen + if (bMod) // sonst schon eingetragen { for (i=0; (i aParam.nCol2 ) - return NULL; // Ende und Aus + return NULL; // Ende und Aus if ( bAdvanceQuery ) { AdvanceQueryParamEntryField(); @@ -1239,7 +1239,7 @@ ScBaseCell* ScQueryCellIterator::GetFirst() nRow = aParam.nRow1; if (aParam.bHasHeader) nRow++; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); return GetThis(); @@ -1271,7 +1271,7 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } } else - break; // for + break; // for } } @@ -1696,7 +1696,7 @@ ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB } else { - pNextRows[i-nStartCol] = MAXROWCOUNT; // nichts gefunden + pNextRows[i-nStartCol] = MAXROWCOUNT; // nichts gefunden pNextIndices[i-nStartCol] = MAXROWCOUNT; } } @@ -1729,7 +1729,7 @@ ScBaseCell* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow ) } else { - pNextRows[nCol-nStartCol] = MAXROWCOUNT; // nichts gefunden + pNextRows[nCol-nStartCol] = MAXROWCOUNT; // nichts gefunden pNextIndices[nCol-nStartCol] = MAXROWCOUNT; } @@ -1799,9 +1799,9 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nCol = nStartCol; bRowEmpty = FALSE; - pIndices = new SCSIZE[nEndCol-nStartCol+1]; - pNextEnd = new SCROW[nEndCol-nStartCol+1]; - ppPatterns = new const ScPatternAttr*[nEndCol-nStartCol+1]; + pIndices = new SCSIZE[nEndCol-nStartCol+1]; + pNextEnd = new SCROW[nEndCol-nStartCol+1]; + ppPatterns = new const ScPatternAttr*[nEndCol-nStartCol+1]; SCROW nSkipTo = MAXROW; BOOL bEmpty = TRUE; @@ -1820,10 +1820,10 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB { pPattern = NULL; if ( nThisEnd < nSkipTo ) - nSkipTo = nThisEnd; // nSkipTo kann gleich hier gesetzt werden + nSkipTo = nThisEnd; // nSkipTo kann gleich hier gesetzt werden } else - bEmpty = FALSE; // Attribute gefunden + bEmpty = FALSE; // Attribute gefunden pIndices[nPos] = nIndex; pNextEnd[nPos] = nThisEnd; @@ -1831,7 +1831,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB } if (bEmpty) - nRow = nSkipTo; // bis zum naechsten Bereichsende ueberspringen + nRow = nSkipTo; // bis zum naechsten Bereichsende ueberspringen bRowEmpty = bEmpty; } @@ -1861,16 +1861,16 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo while ( nCol < nEndCol && ppPatterns[nCol+1-nStartCol] == pPat ) ++nCol; rCol2 = nCol; - ++nCol; // hochzaehlen fuer naechsten Aufruf - return pPat; // gefunden + ++nCol; // hochzaehlen fuer naechsten Aufruf + return pPat; // gefunden } } // naechste Zeile ++nRow; - if ( nRow > nEndRow ) // schon am Ende? - return NULL; // nichts gefunden + if ( nRow > nEndRow ) // schon am Ende? + return NULL; // nichts gefunden BOOL bEmpty = TRUE; SCCOL i; @@ -1890,7 +1890,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo if ( IsDefaultItem( pPattern ) ) pPattern = NULL; else - bEmpty = FALSE; // Attribute gefunden + bEmpty = FALSE; // Attribute gefunden pNextEnd[nPos] = nThisEnd; ppPatterns[nPos] = pPattern; @@ -1905,20 +1905,20 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo } } else if ( ppPatterns[nPos] ) - bEmpty = FALSE; // Bereich noch nicht zuende + bEmpty = FALSE; // Bereich noch nicht zuende } if (bEmpty) { SCCOL nCount = nEndCol-nStartCol+1; - SCROW nSkipTo = pNextEnd[0]; // naechstes Bereichsende suchen + SCROW nSkipTo = pNextEnd[0]; // naechstes Bereichsende suchen for (i=1; i direkt uebernehmen + else if ( pCell ) // nur Zelle -> direkt uebernehmen { pFoundPattern = NULL; - bUseCell = TRUE; // Position von Zelle + bUseCell = TRUE; // Position von Zelle } - else if ( pPattern ) // nur Attribute -> direkt uebernehmen + else if ( pPattern ) // nur Attribute -> direkt uebernehmen { pFoundCell = NULL; pFoundPattern = pPattern; @@ -2002,10 +2002,10 @@ BOOL ScUsedAreaIterator::GetNext() nFoundStartCol = nAttrCol1; nFoundEndCol = nAttrCol2; } - else // gar nichts + else // gar nichts bFound = FALSE; - if ( bUseCell ) // Position von Zelle + if ( bUseCell ) // Position von Zelle { pFoundCell = pCell; nFoundRow = nCellRow; @@ -2062,7 +2062,7 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& rCol, SCROW& rRow1, SCRO else pColIter = NULL; } - return NULL; // is nix mehr + return NULL; // is nix mehr } //------------------------------------------------------------------------------- @@ -2132,14 +2132,14 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2, else pColIter = NULL; } - return NULL; // is nix mehr + return NULL; // is nix mehr } // ============================================================================ SCROW ScRowBreakIterator::NOT_FOUND = -1; -ScRowBreakIterator::ScRowBreakIterator(set& rBreaks) : +ScRowBreakIterator::ScRowBreakIterator(set& rBreaks) : mrBreaks(rBreaks), maItr(rBreaks.begin()), maEnd(rBreaks.end()) { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 8b2f48d8a2cc..b9078a5304ee 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -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 @@ -73,11 +73,11 @@ #include "attrib.hxx" #include "patattr.hxx" #include "globstr.hrc" -#include "sc.hrc" // Slot-IDs +#include "sc.hrc" // Slot-IDs -#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39) -#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20) +#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39) +#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20) // STATIC DATA ----------------------------------------------------------- @@ -97,93 +97,93 @@ USHORT* ScDocumentPool::pVersionMap11 = 0; static SfxItemInfo __READONLY_DATA aItemInfos[] = { - { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // ATTR_FONT - { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_HEIGHT - { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_WEIGHT - { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_FONT_POSTURE - { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_UNDERLINE - { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_OVERLINE - { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // ATTR_FONT_CROSSEDOUT - { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // ATTR_FONT_CONTOUR - { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // ATTR_FONT_SHADOWED - { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // ATTR_FONT_COLOR - { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_FONT_LANGUAGE - { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT from 614 - { SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_HEIGHT from 614 - { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_WEIGHT from 614 - { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_POSTURE from 614 - { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_LANGUAGE from 614 - { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT from 614 - { SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_HEIGHT from 614 - { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_WEIGHT from 614 - { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_POSTURE from 614 - { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_LANGUAGE from 614 - { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // ATTR_FONT_EMPHASISMARK from 614 - { 0, SFX_ITEM_POOLABLE }, // ATTR_USERDEF from 614 / 641c - { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // ATTR_FONT_WORDLINE from 632b - { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // ATTR_FONT_RELIEF from 632b - { SID_ATTR_ALIGN_HYPHENATION, SFX_ITEM_POOLABLE }, // ATTR_HYPHENATE from 632b - { 0, SFX_ITEM_POOLABLE }, // ATTR_SCRIPTSPACE from 614d - { 0, SFX_ITEM_POOLABLE }, // ATTR_HANGPUNCTUATION from 614d - { SID_ATTR_PARA_FORBIDDEN_RULES,SFX_ITEM_POOLABLE }, // ATTR_FORBIDDEN_RULES from 614d - { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY - { SID_ATTR_ALIGN_INDENT, SFX_ITEM_POOLABLE }, // ATTR_INDENT ab 350 - { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY + { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // ATTR_FONT + { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_HEIGHT + { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_WEIGHT + { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_FONT_POSTURE + { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_UNDERLINE + { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_OVERLINE + { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // ATTR_FONT_CROSSEDOUT + { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // ATTR_FONT_CONTOUR + { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // ATTR_FONT_SHADOWED + { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // ATTR_FONT_COLOR + { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_FONT_LANGUAGE + { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT from 614 + { SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_HEIGHT from 614 + { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_WEIGHT from 614 + { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_POSTURE from 614 + { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_LANGUAGE from 614 + { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT from 614 + { SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_HEIGHT from 614 + { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_WEIGHT from 614 + { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_POSTURE from 614 + { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_LANGUAGE from 614 + { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // ATTR_FONT_EMPHASISMARK from 614 + { 0, SFX_ITEM_POOLABLE }, // ATTR_USERDEF from 614 / 641c + { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // ATTR_FONT_WORDLINE from 632b + { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // ATTR_FONT_RELIEF from 632b + { SID_ATTR_ALIGN_HYPHENATION, SFX_ITEM_POOLABLE }, // ATTR_HYPHENATE from 632b + { 0, SFX_ITEM_POOLABLE }, // ATTR_SCRIPTSPACE from 614d + { 0, SFX_ITEM_POOLABLE }, // ATTR_HANGPUNCTUATION from 614d + { SID_ATTR_PARA_FORBIDDEN_RULES,SFX_ITEM_POOLABLE }, // ATTR_FORBIDDEN_RULES from 614d + { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY + { SID_ATTR_ALIGN_INDENT, SFX_ITEM_POOLABLE }, // ATTR_INDENT ab 350 + { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY { SID_ATTR_ALIGN_STACKED, SFX_ITEM_POOLABLE }, // ATTR_STACKED from 680/dr14 (replaces ATTR_ORIENTATION) - { SID_ATTR_ALIGN_DEGREES, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_VALUE ab 367 - { SID_ATTR_ALIGN_LOCKPOS, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_MODE ab 367 + { SID_ATTR_ALIGN_DEGREES, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_VALUE ab 367 + { SID_ATTR_ALIGN_LOCKPOS, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_MODE ab 367 { SID_ATTR_ALIGN_ASIANVERTICAL, SFX_ITEM_POOLABLE }, // ATTR_VERTICAL_ASIAN from 642 - { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // ATTR_WRITINGDIR from 643 - { SID_ATTR_ALIGN_LINEBREAK, SFX_ITEM_POOLABLE }, // ATTR_LINEBREAK + { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // ATTR_WRITINGDIR from 643 + { SID_ATTR_ALIGN_LINEBREAK, SFX_ITEM_POOLABLE }, // ATTR_LINEBREAK { SID_ATTR_ALIGN_SHRINKTOFIT, SFX_ITEM_POOLABLE }, // ATTR_SHRINKTOFIT from 680/dr14 { SID_ATTR_BORDER_DIAG_TLBR, SFX_ITEM_POOLABLE }, // ATTR_BORDER_TLBR from 680/dr14 { SID_ATTR_BORDER_DIAG_BLTR, SFX_ITEM_POOLABLE }, // ATTR_BORDER_BLTR from 680/dr14 - { SID_ATTR_ALIGN_MARGIN, SFX_ITEM_POOLABLE }, // ATTR_MARGIN - { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE - { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE_FLAG - { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, // ATTR_VALUE_FORMAT - { ATTR_LANGUAGE_FORMAT, SFX_ITEM_POOLABLE }, // ATTR_LANGUAGE_FORMAT ab 329, wird im Dialog mit SID_ATTR_NUMBERFORMAT_VALUE kombiniert - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // ATTR_BACKGROUND - { SID_SCATTR_PROTECTION, SFX_ITEM_POOLABLE }, // ATTR_PROTECTION - { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // ATTR_BORDER - { SID_ATTR_BORDER_INNER, SFX_ITEM_POOLABLE }, // ATTR_BORDER_INNER - { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // ATTR_SHADOW - { 0, SFX_ITEM_POOLABLE }, // ATTR_VALIDDATA - { 0, SFX_ITEM_POOLABLE }, // ATTR_CONDITIONAL - { 0, SFX_ITEM_POOLABLE }, // ATTR_PATTERN - { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // ATTR_LRSPACE - { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // ATTR_ULSPACE - { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, // ATTR_PAGE - { 0, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERTRAY, seit 303 nur noch dummy - { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERBIN - { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SIZE - { SID_ATTR_PAGE_MAXSIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_MAXSIZE - { SID_ATTR_PAGE_EXT1, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HORCENTER - { SID_ATTR_PAGE_EXT2, SFX_ITEM_POOLABLE }, // ATTR_PAGE_VERCENTER - { SID_ATTR_PAGE_ON, SFX_ITEM_POOLABLE }, // ATTR_PAGE_ON - { SID_ATTR_PAGE_DYNAMIC, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DYNAMIC - { SID_ATTR_PAGE_SHARED, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SHARED - { SID_SCATTR_PAGE_NOTES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NOTES - { SID_SCATTR_PAGE_GRID, SFX_ITEM_POOLABLE }, // ATTR_PAGE_GRID - { SID_SCATTR_PAGE_HEADERS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERS - { SID_SCATTR_PAGE_CHARTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_CHARTS - { SID_SCATTR_PAGE_OBJECTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_OBJECTS - { SID_SCATTR_PAGE_DRAWINGS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DRAWINGS - { SID_SCATTR_PAGE_TOPDOWN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_TOPDOWN - { SID_SCATTR_PAGE_SCALE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALE - { SID_SCATTR_PAGE_SCALETOPAGES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALETOPAGES - { SID_SCATTR_PAGE_FIRSTPAGENO, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FIRSTPAGENO - { SID_SCATTR_PAGE_PRINTAREA, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTAREA - { SID_SCATTR_PAGE_REPEATROW, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATROW - { SID_SCATTR_PAGE_REPEATCOL, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATCOL - { SID_SCATTR_PAGE_PRINTTABLES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTTABLES - { SID_SCATTR_PAGE_HEADERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERLEFT - { SID_SCATTR_PAGE_FOOTERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERLEFT - { SID_SCATTR_PAGE_HEADERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERRIGHT - { SID_SCATTR_PAGE_FOOTERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERRIGHT - { SID_ATTR_PAGE_HEADERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERSET - { SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERSET - { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FORMULAS + { SID_ATTR_ALIGN_MARGIN, SFX_ITEM_POOLABLE }, // ATTR_MARGIN + { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE + { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE_FLAG + { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, // ATTR_VALUE_FORMAT + { ATTR_LANGUAGE_FORMAT, SFX_ITEM_POOLABLE }, // ATTR_LANGUAGE_FORMAT ab 329, wird im Dialog mit SID_ATTR_NUMBERFORMAT_VALUE kombiniert + { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // ATTR_BACKGROUND + { SID_SCATTR_PROTECTION, SFX_ITEM_POOLABLE }, // ATTR_PROTECTION + { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // ATTR_BORDER + { SID_ATTR_BORDER_INNER, SFX_ITEM_POOLABLE }, // ATTR_BORDER_INNER + { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // ATTR_SHADOW + { 0, SFX_ITEM_POOLABLE }, // ATTR_VALIDDATA + { 0, SFX_ITEM_POOLABLE }, // ATTR_CONDITIONAL + { 0, SFX_ITEM_POOLABLE }, // ATTR_PATTERN + { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // ATTR_LRSPACE + { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // ATTR_ULSPACE + { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, // ATTR_PAGE + { 0, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERTRAY, seit 303 nur noch dummy + { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERBIN + { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SIZE + { SID_ATTR_PAGE_MAXSIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_MAXSIZE + { SID_ATTR_PAGE_EXT1, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HORCENTER + { SID_ATTR_PAGE_EXT2, SFX_ITEM_POOLABLE }, // ATTR_PAGE_VERCENTER + { SID_ATTR_PAGE_ON, SFX_ITEM_POOLABLE }, // ATTR_PAGE_ON + { SID_ATTR_PAGE_DYNAMIC, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DYNAMIC + { SID_ATTR_PAGE_SHARED, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SHARED + { SID_SCATTR_PAGE_NOTES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NOTES + { SID_SCATTR_PAGE_GRID, SFX_ITEM_POOLABLE }, // ATTR_PAGE_GRID + { SID_SCATTR_PAGE_HEADERS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERS + { SID_SCATTR_PAGE_CHARTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_CHARTS + { SID_SCATTR_PAGE_OBJECTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_OBJECTS + { SID_SCATTR_PAGE_DRAWINGS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DRAWINGS + { SID_SCATTR_PAGE_TOPDOWN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_TOPDOWN + { SID_SCATTR_PAGE_SCALE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALE + { SID_SCATTR_PAGE_SCALETOPAGES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALETOPAGES + { SID_SCATTR_PAGE_FIRSTPAGENO, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FIRSTPAGENO + { SID_SCATTR_PAGE_PRINTAREA, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTAREA + { SID_SCATTR_PAGE_REPEATROW, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATROW + { SID_SCATTR_PAGE_REPEATCOL, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATCOL + { SID_SCATTR_PAGE_PRINTTABLES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTTABLES + { SID_SCATTR_PAGE_HEADERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERLEFT + { SID_SCATTR_PAGE_FOOTERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERLEFT + { SID_SCATTR_PAGE_HEADERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERRIGHT + { SID_SCATTR_PAGE_FOOTERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERRIGHT + { SID_ATTR_PAGE_HEADERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERSET + { SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERSET + { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FORMULAS { SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NULLVALS { SID_SCATTR_PAGE_SCALETO, SFX_ITEM_POOLABLE } // ATTR_PAGE_SCALETO }; @@ -192,12 +192,12 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] = ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) - : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")), + : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")), ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, NULL, bLoadRefCounts ), - pSecondary ( pSecPool ) + pSecondary ( pSecPool ) { - // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead + // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead Font aStdFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(), @@ -210,14 +210,14 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) SvxFontItem aDummy( ATTR_FONT ); GetDefaultFonts( aDummy, *pCjkFont, *pCtlFont ); - SvxBoxInfoItem* pGlobalBorderInnerAttr = new SvxBoxInfoItem( ATTR_BORDER_INNER ); - SfxItemSet* pSet = new SfxItemSet( *this, ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet aSetItemItemSet( *this, + SvxBoxInfoItem* pGlobalBorderInnerAttr = new SvxBoxInfoItem( ATTR_BORDER_INNER ); + SfxItemSet* pSet = new SfxItemSet( *this, ATTR_PATTERN_START, ATTR_PATTERN_END ); + SfxItemSet aSetItemItemSet( *this, ATTR_BACKGROUND, ATTR_BACKGROUND, - ATTR_BORDER, ATTR_SHADOW, - ATTR_LRSPACE, ATTR_ULSPACE, + ATTR_BORDER, ATTR_SHADOW, + ATTR_LRSPACE, ATTR_ULSPACE, ATTR_PAGE_SIZE, ATTR_PAGE_SIZE, - ATTR_PAGE_ON, ATTR_PAGE_SHARED, + ATTR_PAGE_ON, ATTR_PAGE_SHARED, 0 ); pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_HORI); @@ -228,7 +228,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) ppPoolDefaults = new SfxPoolItem*[ATTR_ENDINDEX-ATTR_STARTINDEX+1]; - ppPoolDefaults[ ATTR_FONT - ATTR_STARTINDEX ] = pStdFont; + ppPoolDefaults[ ATTR_FONT - ATTR_STARTINDEX ] = pStdFont; ppPoolDefaults[ ATTR_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_FONT_HEIGHT ); // 10 pt; ppPoolDefaults[ ATTR_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_FONT_WEIGHT ); ppPoolDefaults[ ATTR_FONT_POSTURE - ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_FONT_POSTURE ); @@ -238,100 +238,100 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) ppPoolDefaults[ ATTR_FONT_CONTOUR - ATTR_STARTINDEX ] = new SvxContourItem( sal_False, ATTR_FONT_CONTOUR ); ppPoolDefaults[ ATTR_FONT_SHADOWED - ATTR_STARTINDEX ] = new SvxShadowedItem( sal_False, ATTR_FONT_SHADOWED ); ppPoolDefaults[ ATTR_FONT_COLOR - ATTR_STARTINDEX ] = new SvxColorItem( Color(COL_AUTO), ATTR_FONT_COLOR ); - ppPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_FONT_LANGUAGE ); - ppPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont; + ppPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_FONT_LANGUAGE ); + ppPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont; ppPoolDefaults[ ATTR_CJK_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CJK_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CJK_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CJK_FONT_POSTURE ); - ppPoolDefaults[ ATTR_CJK_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), + ppPoolDefaults[ ATTR_CJK_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_CJK_FONT_LANGUAGE ); - ppPoolDefaults[ ATTR_CTL_FONT - ATTR_STARTINDEX ] = pCtlFont; + ppPoolDefaults[ ATTR_CTL_FONT - ATTR_STARTINDEX ] = pCtlFont; ppPoolDefaults[ ATTR_CTL_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CTL_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CTL_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CTL_FONT_POSTURE ); - ppPoolDefaults[ ATTR_CTL_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), + ppPoolDefaults[ ATTR_CTL_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_CTL_FONT_LANGUAGE ); ppPoolDefaults[ ATTR_FONT_EMPHASISMARK-ATTR_STARTINDEX ] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, ATTR_FONT_EMPHASISMARK ); - ppPoolDefaults[ ATTR_USERDEF - ATTR_STARTINDEX ] = new SvXMLAttrContainerItem( ATTR_USERDEF ); + ppPoolDefaults[ ATTR_USERDEF - ATTR_STARTINDEX ] = new SvXMLAttrContainerItem( ATTR_USERDEF ); ppPoolDefaults[ ATTR_FONT_WORDLINE - ATTR_STARTINDEX ] = new SvxWordLineModeItem(sal_False, ATTR_FONT_WORDLINE ); ppPoolDefaults[ ATTR_FONT_RELIEF - ATTR_STARTINDEX ] = new SvxCharReliefItem( RELIEF_NONE, ATTR_FONT_RELIEF ); - ppPoolDefaults[ ATTR_HYPHENATE - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HYPHENATE ); + ppPoolDefaults[ ATTR_HYPHENATE - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HYPHENATE ); ppPoolDefaults[ ATTR_SCRIPTSPACE - ATTR_STARTINDEX ] = new SvxScriptSpaceItem( sal_False, ATTR_SCRIPTSPACE); ppPoolDefaults[ ATTR_HANGPUNCTUATION - ATTR_STARTINDEX ] = new SvxHangingPunctuationItem( sal_False, ATTR_HANGPUNCTUATION); ppPoolDefaults[ ATTR_FORBIDDEN_RULES - ATTR_STARTINDEX ] = new SvxForbiddenRuleItem( sal_False, ATTR_FORBIDDEN_RULES); ppPoolDefaults[ ATTR_HOR_JUSTIFY - ATTR_STARTINDEX ] = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY); - ppPoolDefaults[ ATTR_INDENT - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 ); + ppPoolDefaults[ ATTR_INDENT - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 ); ppPoolDefaults[ ATTR_VER_JUSTIFY - ATTR_STARTINDEX ] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY); ppPoolDefaults[ ATTR_STACKED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_STACKED, FALSE ); - ppPoolDefaults[ ATTR_ROTATE_VALUE - ATTR_STARTINDEX ] = new SfxInt32Item( ATTR_ROTATE_VALUE, 0 ); - ppPoolDefaults[ ATTR_ROTATE_MODE - ATTR_STARTINDEX ] = new SvxRotateModeItem( SVX_ROTATE_MODE_BOTTOM, ATTR_ROTATE_MODE ); - ppPoolDefaults[ ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_VERTICAL_ASIAN ); - // The default for the ATTR_WRITINGDIR cell attribute must by FRMDIR_ENVIRONMENT, - // so that value is returned when asking for a default cell's attributes. - // The value from the page style is set as DefaultHorizontalTextDirection for the EditEngine. - ppPoolDefaults[ ATTR_WRITINGDIR - ATTR_STARTINDEX ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, ATTR_WRITINGDIR ); - ppPoolDefaults[ ATTR_LINEBREAK - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_LINEBREAK ); + ppPoolDefaults[ ATTR_ROTATE_VALUE - ATTR_STARTINDEX ] = new SfxInt32Item( ATTR_ROTATE_VALUE, 0 ); + ppPoolDefaults[ ATTR_ROTATE_MODE - ATTR_STARTINDEX ] = new SvxRotateModeItem( SVX_ROTATE_MODE_BOTTOM, ATTR_ROTATE_MODE ); + ppPoolDefaults[ ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_VERTICAL_ASIAN ); + // The default for the ATTR_WRITINGDIR cell attribute must by FRMDIR_ENVIRONMENT, + // so that value is returned when asking for a default cell's attributes. + // The value from the page style is set as DefaultHorizontalTextDirection for the EditEngine. + ppPoolDefaults[ ATTR_WRITINGDIR - ATTR_STARTINDEX ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, ATTR_WRITINGDIR ); + ppPoolDefaults[ ATTR_LINEBREAK - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_LINEBREAK ); ppPoolDefaults[ ATTR_SHRINKTOFIT - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_SHRINKTOFIT ); ppPoolDefaults[ ATTR_BORDER_TLBR - ATTR_STARTINDEX ] = new SvxLineItem( ATTR_BORDER_TLBR ); ppPoolDefaults[ ATTR_BORDER_BLTR - ATTR_STARTINDEX ] = new SvxLineItem( ATTR_BORDER_BLTR ); ppPoolDefaults[ ATTR_MARGIN - ATTR_STARTINDEX ] = new SvxMarginItem( ATTR_MARGIN ); - ppPoolDefaults[ ATTR_MERGE - ATTR_STARTINDEX ] = new ScMergeAttr; - ppPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new ScMergeFlagAttr; - ppPoolDefaults[ ATTR_VALUE_FORMAT - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALUE_FORMAT, 0 ); - ppPoolDefaults[ ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX ] = new SvxLanguageItem( ScGlobal::eLnge, ATTR_LANGUAGE_FORMAT ); - ppPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( Color(COL_TRANSPARENT), ATTR_BACKGROUND ); - ppPoolDefaults[ ATTR_PROTECTION - ATTR_STARTINDEX ] = new ScProtectionAttr; - ppPoolDefaults[ ATTR_BORDER - ATTR_STARTINDEX ] = new SvxBoxItem( ATTR_BORDER ); - ppPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr; - ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); - ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); - ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); - - // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem - //! zusaetzliche Methode ScGlobal::IsInit() oder so... - //! oder erkennen, ob dies der Secondary-Pool fuer einen MessagePool ist + ppPoolDefaults[ ATTR_MERGE - ATTR_STARTINDEX ] = new ScMergeAttr; + ppPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new ScMergeFlagAttr; + ppPoolDefaults[ ATTR_VALUE_FORMAT - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALUE_FORMAT, 0 ); + ppPoolDefaults[ ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX ] = new SvxLanguageItem( ScGlobal::eLnge, ATTR_LANGUAGE_FORMAT ); + ppPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( Color(COL_TRANSPARENT), ATTR_BACKGROUND ); + ppPoolDefaults[ ATTR_PROTECTION - ATTR_STARTINDEX ] = new ScProtectionAttr; + ppPoolDefaults[ ATTR_BORDER - ATTR_STARTINDEX ] = new SvxBoxItem( ATTR_BORDER ); + ppPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr; + ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); + ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); + ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); + + // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem + //! zusaetzliche Methode ScGlobal::IsInit() oder so... + //! oder erkennen, ob dies der Secondary-Pool fuer einen MessagePool ist if ( ScGlobal::GetEmptyBrushItem() ) - ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); + ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else - ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD)) ); //! without name? - - ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); - ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); - ppPoolDefaults[ ATTR_PAGE - ATTR_STARTINDEX ] = new SvxPageItem( ATTR_PAGE ); - ppPoolDefaults[ ATTR_PAGE_PAPERTRAY - ATTR_STARTINDEX ] = new SfxAllEnumItem( ATTR_PAGE_PAPERTRAY ); - ppPoolDefaults[ ATTR_PAGE_PAPERBIN - ATTR_STARTINDEX ] = new SvxPaperBinItem( ATTR_PAGE_PAPERBIN ); - ppPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE ); - ppPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE ); - ppPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); - ppPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); - ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, TRUE ); - ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, TRUE ); - ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, TRUE ); - ppPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, FALSE ); - ppPoolDefaults[ ATTR_PAGE_GRID - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, FALSE ); - ppPoolDefaults[ ATTR_PAGE_HEADERS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, FALSE ); - ppPoolDefaults[ ATTR_PAGE_CHARTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS ); - ppPoolDefaults[ ATTR_PAGE_OBJECTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS ); - ppPoolDefaults[ ATTR_PAGE_DRAWINGS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS ); - ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, TRUE ); - ppPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 ); - ppPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 ); - ppPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ); - ppPoolDefaults[ ATTR_PAGE_PRINTAREA - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_PRINTAREA ); - ppPoolDefaults[ ATTR_PAGE_REPEATROW - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATROW ); - ppPoolDefaults[ ATTR_PAGE_REPEATCOL - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATCOL ); - ppPoolDefaults[ ATTR_PAGE_PRINTTABLES- ATTR_STARTINDEX ] = new ScTableListItem( ATTR_PAGE_PRINTTABLES ); - ppPoolDefaults[ ATTR_PAGE_HEADERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERLEFT ); - ppPoolDefaults[ ATTR_PAGE_FOOTERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERLEFT ); - ppPoolDefaults[ ATTR_PAGE_HEADERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); - ppPoolDefaults[ ATTR_PAGE_FOOTERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); - ppPoolDefaults[ ATTR_PAGE_HEADERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet ); - ppPoolDefaults[ ATTR_PAGE_FOOTERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet ); - ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE ); - ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE ); + ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, + String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD)) ); //! without name? + + ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); + ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); + ppPoolDefaults[ ATTR_PAGE - ATTR_STARTINDEX ] = new SvxPageItem( ATTR_PAGE ); + ppPoolDefaults[ ATTR_PAGE_PAPERTRAY - ATTR_STARTINDEX ] = new SfxAllEnumItem( ATTR_PAGE_PAPERTRAY ); + ppPoolDefaults[ ATTR_PAGE_PAPERBIN - ATTR_STARTINDEX ] = new SvxPaperBinItem( ATTR_PAGE_PAPERBIN ); + ppPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE ); + ppPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE ); + ppPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); + ppPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); + ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, TRUE ); + ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, TRUE ); + ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, TRUE ); + ppPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, FALSE ); + ppPoolDefaults[ ATTR_PAGE_GRID - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, FALSE ); + ppPoolDefaults[ ATTR_PAGE_HEADERS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, FALSE ); + ppPoolDefaults[ ATTR_PAGE_CHARTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS ); + ppPoolDefaults[ ATTR_PAGE_OBJECTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS ); + ppPoolDefaults[ ATTR_PAGE_DRAWINGS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS ); + ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, TRUE ); + ppPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 ); + ppPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 ); + ppPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ); + ppPoolDefaults[ ATTR_PAGE_PRINTAREA - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_PRINTAREA ); + ppPoolDefaults[ ATTR_PAGE_REPEATROW - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATROW ); + ppPoolDefaults[ ATTR_PAGE_REPEATCOL - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATCOL ); + ppPoolDefaults[ ATTR_PAGE_PRINTTABLES- ATTR_STARTINDEX ] = new ScTableListItem( ATTR_PAGE_PRINTTABLES ); + ppPoolDefaults[ ATTR_PAGE_HEADERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERLEFT ); + ppPoolDefaults[ ATTR_PAGE_FOOTERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERLEFT ); + ppPoolDefaults[ ATTR_PAGE_HEADERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); + ppPoolDefaults[ ATTR_PAGE_FOOTERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); + ppPoolDefaults[ ATTR_PAGE_HEADERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet ); + ppPoolDefaults[ ATTR_PAGE_FOOTERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet ); + ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE ); + ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE ); ppPoolDefaults[ ATTR_PAGE_SCALETO - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 ); -// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 ); +// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 ); SetDefaults( ppPoolDefaults ); @@ -401,12 +401,12 @@ void ScDocumentPool::InitVersionMaps() // alte WhichId's mappen // nicht mit ATTR_* zaehlen, falls die sich nochmal aendern - // erste Map: ATTR_LANGUAGE_FORMAT ab sv329 eingefuegt + // erste Map: ATTR_LANGUAGE_FORMAT ab sv329 eingefuegt - const USHORT nMap1Start = 100; // alter ATTR_STARTINDEX - const USHORT nMap1End = 157; // alter ATTR_ENDINDEX + const USHORT nMap1Start = 100; // alter ATTR_STARTINDEX + const USHORT nMap1End = 157; // alter ATTR_ENDINDEX const USHORT nMap1Count = nMap1End - nMap1Start + 1; - const USHORT nMap1New = 18; // ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX + const USHORT nMap1New = 18; // ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX pVersionMap1 = new USHORT [ nMap1Count ]; USHORT i, j; for ( i=0, j=nMap1Start; i < nMap1New; i++, j++ ) @@ -415,12 +415,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap1New, j=nMap1Start+nMap1New+1; i < nMap1Count; i++, j++ ) pVersionMap1[i] = j; - // zweite Map: ATTR_VALIDDATA und ATTR_CONDITIONAL ab 341 eingefuegt + // zweite Map: ATTR_VALIDDATA und ATTR_CONDITIONAL ab 341 eingefuegt - const USHORT nMap2Start = 100; // ATTR_STARTINDEX - const USHORT nMap2End = 158; // ATTR_ENDINDEX + const USHORT nMap2Start = 100; // ATTR_STARTINDEX + const USHORT nMap2End = 158; // ATTR_ENDINDEX const USHORT nMap2Count = nMap2End - nMap2Start + 1; - const USHORT nMap2New = 24; // ATTR_VALIDDATA - ATTR_STARTINDEX + const USHORT nMap2New = 24; // ATTR_VALIDDATA - ATTR_STARTINDEX pVersionMap2 = new USHORT [ nMap2Count ]; for ( i=0, j=nMap2Start; i < nMap2New; i++, j++ ) pVersionMap2[i] = j; @@ -428,12 +428,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap2New, j=nMap2Start+nMap2New+2; i < nMap2Count; i++, j++ ) pVersionMap2[i] = j; - // dritte Map: ATTR_INDENT ab 350 eingefuegt + // dritte Map: ATTR_INDENT ab 350 eingefuegt - const USHORT nMap3Start = 100; // ATTR_STARTINDEX - const USHORT nMap3End = 160; // ATTR_ENDINDEX + const USHORT nMap3Start = 100; // ATTR_STARTINDEX + const USHORT nMap3End = 160; // ATTR_ENDINDEX const USHORT nMap3Count = nMap3End - nMap3Start + 1; - const USHORT nMap3New = 11; // ATTR_INDENT - ATTR_STARTINDEX + const USHORT nMap3New = 11; // ATTR_INDENT - ATTR_STARTINDEX pVersionMap3 = new USHORT [ nMap3Count ]; for ( i=0, j=nMap3Start; i < nMap3New; i++, j++ ) pVersionMap3[i] = j; @@ -441,12 +441,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap3New, j=nMap3Start+nMap3New+1; i < nMap3Count; i++, j++ ) pVersionMap3[i] = j; - // vierte Map: ATTR_ROTATE_VALUE und ATTR_ROTATE_MODE ab 367 eingefuegt + // vierte Map: ATTR_ROTATE_VALUE und ATTR_ROTATE_MODE ab 367 eingefuegt - const USHORT nMap4Start = 100; // ATTR_STARTINDEX - const USHORT nMap4End = 161; // ATTR_ENDINDEX + const USHORT nMap4Start = 100; // ATTR_STARTINDEX + const USHORT nMap4End = 161; // ATTR_ENDINDEX const USHORT nMap4Count = nMap4End - nMap4Start + 1; - const USHORT nMap4New = 14; // ATTR_ROTATE_VALUE - ATTR_STARTINDEX + const USHORT nMap4New = 14; // ATTR_ROTATE_VALUE - ATTR_STARTINDEX pVersionMap4 = new USHORT [ nMap4Count ]; for ( i=0, j=nMap4Start; i < nMap4New; i++, j++ ) pVersionMap4[i] = j; @@ -454,12 +454,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap4New, j=nMap4Start+nMap4New+2; i < nMap4Count; i++, j++ ) pVersionMap4[i] = j; - // fifth map: CJK..., CTL..., EMPHASISMARK, TWOLINES (12 items) added in 614 + // fifth map: CJK..., CTL..., EMPHASISMARK, TWOLINES (12 items) added in 614 - const USHORT nMap5Start = 100; // ATTR_STARTINDEX - const USHORT nMap5End = 163; // ATTR_ENDINDEX + const USHORT nMap5Start = 100; // ATTR_STARTINDEX + const USHORT nMap5End = 163; // ATTR_ENDINDEX const USHORT nMap5Count = nMap5End - nMap5Start + 1; - const USHORT nMap5New = 10; // ATTR_CJK_FONT - ATTR_STARTINDEX + const USHORT nMap5New = 10; // ATTR_CJK_FONT - ATTR_STARTINDEX pVersionMap5 = new USHORT [ nMap5Count ]; for ( i=0, j=nMap5Start; i < nMap5New; i++, j++ ) pVersionMap5[i] = j; @@ -469,10 +469,10 @@ void ScDocumentPool::InitVersionMaps() // sixth map: ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES added in 614d - const USHORT nMap6Start = 100; // ATTR_STARTINDEX - const USHORT nMap6End = 175; // ATTR_ENDINDEX + const USHORT nMap6Start = 100; // ATTR_STARTINDEX + const USHORT nMap6End = 175; // ATTR_ENDINDEX const USHORT nMap6Count = nMap6End - nMap6Start + 1; - const USHORT nMap6New = 22; // ATTR_SCRIPTSPACE - ATTR_STARTINDEX + const USHORT nMap6New = 22; // ATTR_SCRIPTSPACE - ATTR_STARTINDEX pVersionMap6 = new USHORT [ nMap6Count ]; for ( i=0, j=nMap6Start; i < nMap6New; i++, j++ ) pVersionMap6[i] = j; @@ -480,12 +480,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap6New, j=nMap6Start+nMap6New+3; i < nMap6Count; i++, j++ ) pVersionMap6[i] = j; - // seventh map: ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE added in 632b + // seventh map: ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE added in 632b - const USHORT nMap7Start = 100; // ATTR_STARTINDEX - const USHORT nMap7End = 178; // ATTR_ENDINDEX + const USHORT nMap7Start = 100; // ATTR_STARTINDEX + const USHORT nMap7End = 178; // ATTR_ENDINDEX const USHORT nMap7Count = nMap7End - nMap7Start + 1; - const USHORT nMap7New = 22; // ATTR_FONT_WORDLINE - ATTR_STARTINDEX + const USHORT nMap7New = 22; // ATTR_FONT_WORDLINE - ATTR_STARTINDEX pVersionMap7 = new USHORT [ nMap7Count ]; for ( i=0, j=nMap7Start; i < nMap7New; i++, j++ ) pVersionMap7[i] = j; @@ -493,12 +493,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap7New, j=nMap7Start+nMap7New+3; i < nMap7Count; i++, j++ ) pVersionMap7[i] = j; - // eighth map: ATTR_VERTICAL_ASIAN added in 642q + // eighth map: ATTR_VERTICAL_ASIAN added in 642q - const USHORT nMap8Start = 100; // ATTR_STARTINDEX - const USHORT nMap8End = 181; // ATTR_ENDINDEX + const USHORT nMap8Start = 100; // ATTR_STARTINDEX + const USHORT nMap8End = 181; // ATTR_ENDINDEX const USHORT nMap8Count = nMap8End - nMap8Start + 1; - const USHORT nMap8New = 34; // ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX + const USHORT nMap8New = 34; // ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX pVersionMap8 = new USHORT [ nMap8Count ]; for ( i=0, j=nMap8Start; i < nMap8New; i++, j++ ) pVersionMap8[i] = j; @@ -506,12 +506,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap8New, j=nMap8Start+nMap8New+1; i < nMap8Count; i++, j++ ) pVersionMap8[i] = j; - // 9th map: ATTR_WRITINGDIR added in 643y + // 9th map: ATTR_WRITINGDIR added in 643y - const USHORT nMap9Start = 100; // ATTR_STARTINDEX - const USHORT nMap9End = 182; // ATTR_ENDINDEX + const USHORT nMap9Start = 100; // ATTR_STARTINDEX + const USHORT nMap9End = 182; // ATTR_ENDINDEX const USHORT nMap9Count = nMap9End - nMap9Start + 1; - const USHORT nMap9New = 35; // ATTR_WRITINGDIR - ATTR_STARTINDEX + const USHORT nMap9New = 35; // ATTR_WRITINGDIR - ATTR_STARTINDEX pVersionMap9 = new USHORT [ nMap9Count ]; for ( i=0, j=nMap9Start; i < nMap9New; i++, j++ ) pVersionMap9[i] = j; @@ -583,25 +583,25 @@ void ScDocumentPool::DeleteVersionMaps() // ---------------------------------------------------------------------------------------- // -// Fuer die Pattern-Attribute (SetItems) kann der USHORT RefCount leicht ueberlaufen -// (z.B. 600 ganze Zeilen abwechselnd formatieren). -// Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder -// heruntergezaehlt. Dieser RefCount wird dann erst beim naechsten Laden neu gezaehlt. -// Die Differenz zwischen SC_MAX_POOLREF und SC_SAFE_POOLREF ist ein wenig groesser -// als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert -// wird (Assertions). +// Fuer die Pattern-Attribute (SetItems) kann der USHORT RefCount leicht ueberlaufen +// (z.B. 600 ganze Zeilen abwechselnd formatieren). +// Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder +// heruntergezaehlt. Dieser RefCount wird dann erst beim naechsten Laden neu gezaehlt. +// Die Differenz zwischen SC_MAX_POOLREF und SC_SAFE_POOLREF ist ein wenig groesser +// als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert +// wird (Assertions). // const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich ) { - if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special + if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special return SfxItemPool::Put( rItem, nWhich ); - // das Default-Pattern dieses Pools nicht kopieren + // das Default-Pattern dieses Pools nicht kopieren if (&rItem == ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ]) return rItem; - // ansonsten muss Put immer passieren, weil es ein anderer Pool sein kann + // ansonsten muss Put immer passieren, weil es ein anderer Pool sein kann const SfxPoolItem& rNew = SfxItemPool::Put( rItem, nWhich ); CheckRef( rNew ); return rNew; @@ -609,7 +609,7 @@ const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHOR void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) { - if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special + if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special { ULONG nRef = rItem.GetRefCount(); if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) @@ -619,13 +619,13 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) DBG_ERROR("Wer fummelt da an meinen Ref-Counts herum"); SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF ); } - return; // nicht herunterzaehlen + return; // nicht herunterzaehlen } } SfxItemPool::Remove( rItem ); } -void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static +void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static { ULONG nRef = rItem.GetRefCount(); if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) @@ -678,11 +678,11 @@ SfxItemPool* __EXPORT ScDocumentPool::Clone() const SfxItemPresentation lcl_HFPresentation ( - const SfxPoolItem& rItem, + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit eCoreMetric, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl ) { @@ -695,10 +695,10 @@ SfxItemPresentation lcl_HFPresentation return SFX_ITEM_PRESENTATION_NONE; } - SfxItemIter aIter( rSet ); + SfxItemIter aIter( rSet ); pItem = aIter.FirstItem(); - String aText; - String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " + " )); + String aText; + String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " + " )); while( pItem ) { @@ -780,15 +780,15 @@ SfxItemPresentation lcl_HFPresentation } SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( - const SfxPoolItem& rItem, + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl ) const { - USHORT nW = rItem.Which(); - String aStrYes ( ScGlobal::GetRscString(STR_YES) ); - String aStrNo ( ScGlobal::GetRscString(STR_NO) ); + USHORT nW = rItem.Which(); + String aStrYes ( ScGlobal::GetRscString(STR_YES) ); + String aStrNo ( ScGlobal::GetRscString(STR_NO) ); String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); switch( nW ) @@ -799,7 +799,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_PRINTDIR); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? ScGlobal::GetRscString(STR_SCATTR_PAGE_TOPDOWN) : @@ -818,7 +818,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_HEADERS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -835,7 +835,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NULLVALS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -852,7 +852,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FORMULAS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -869,7 +869,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NOTES); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -886,7 +886,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_GRID); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -899,7 +899,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_SCALETOPAGES: { - USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); if( nPagNo ) { @@ -909,7 +909,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( { rText.Assign( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETOPAGES ) ).Append( aStrSep ); } -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: { String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) ); @@ -932,7 +932,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_FIRSTPAGENO: { - USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); if( nPagNo ) { @@ -941,7 +941,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += String::CreateFromInt32( nPagNo ); break; @@ -960,7 +960,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_SCALE: { - USHORT nPercent = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPercent = ((const SfxUInt16Item&)rItem).GetValue(); if( nPercent ) { @@ -969,7 +969,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_SCALE); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += String::CreateFromInt32( nPercent ); rText += '%'; @@ -989,9 +989,9 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_HEADERSET: { - String aBuffer; + String aBuffer; - if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) { rText = ScGlobal::GetRscString(STR_HEADER); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " )); @@ -1003,9 +1003,9 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_FOOTERSET: { - String aBuffer; + String aBuffer; - if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) { rText = ScGlobal::GetRscString(STR_FOOTER); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " )); @@ -1045,7 +1045,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const { - // eigene Attribute: Twips, alles andere 1/100 mm + // eigene Attribute: Twips, alles andere 1/100 mm if ( nWhich >= ATTR_STARTINDEX && nWhich <= ATTR_ENDINDEX ) return SFX_MAPUNIT_TWIP; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index d2c99c75a95e..1c1cf3983083 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -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 @@ -77,7 +77,7 @@ #include "validat.hxx" #include "progress.hxx" #include "detdata.hxx" -#include "sc.hrc" // FID_DATACHANGED +#include "sc.hrc" // FID_DATACHANGED #include "ddelink.hxx" #include "chgtrack.hxx" #include "chgviset.hxx" @@ -123,7 +123,7 @@ private: // STATIC DATA ----------------------------------------------------------- -ScDocument::ScDocument( ScDocumentMode eMode, +ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : xServiceManager( ::comphelper::getProcessServiceFactory() ), mpUndoManager( NULL ), @@ -187,7 +187,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, bIsUndo( eMode == SCDOCMODE_UNDO ), bIsVisible( FALSE ), bIsEmbedded( FALSE ), -// bNoSetDirty( TRUE ), +// bNoSetDirty( TRUE ), bNoSetDirty( FALSE ), bInsertingFromOtherDoc( FALSE ), bLoadingMedium( false ), @@ -239,8 +239,8 @@ ScDocument::ScDocument( ScDocumentMode eMode, } else { - pTab[0] = NULL; - pBASM = NULL; + pTab[0] = NULL; + pBASM = NULL; pChartListenerCollection = NULL; pRefreshTimerControl = NULL; } @@ -263,13 +263,13 @@ ScDocument::ScDocument( ScDocumentMode eMode, aTrackTimer.SetTimeout( 100 ); } -sfx2::LinkManager* ScDocument::GetLinkManager() const -{ +sfx2::LinkManager* ScDocument::GetLinkManager() const +{ if ( bAutoCalc && !pLinkManager && pShell) { pLinkManager = new sfx2::LinkManager( pShell ); } - return pLinkManager; + return pLinkManager; } @@ -293,8 +293,8 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram ) void ScDocument::SetDocVisible( BOOL bSet ) { - // called from view ctor - only for a visible document, - // each new sheet's RTL flag is initialized from the locale + // called from view ctor - only for a visible document, + // each new sheet's RTL flag is initialized from the locale bIsVisible = bSet; } @@ -333,17 +333,17 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) { - if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln + if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln { - aTrackTimer.Start(); // spaeter nochmal versuchen + aTrackTimer.Start(); // spaeter nochmal versuchen } - else if (pShell) // ausfuehren + else if (pShell) // ausfuehren { TrackFormulas(); pShell->Broadcast( SfxSimpleHint( FID_DATACHANGED ) ); ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) ); - // modified... + // modified... if (!pShell->IsModified()) { @@ -362,7 +362,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) void ScDocument::StartTrackTimer() { - if (!aTrackTimer.IsActive()) // nicht ewig aufschieben + if (!aTrackTimer.IsActive()) // nicht ewig aufschieben aTrackTimer.Start(); } @@ -374,7 +374,7 @@ ScDocument::~ScDocument() // first of all disable all refresh timers by deleting the control if ( pRefreshTimerControl ) - { // To be sure there isn't anything running do it with a protector, + { // To be sure there isn't anything running do it with a protector, // this ensures also that nothing needs the control anymore. ScRefreshTimerProtector aProt( GetRefreshTimerControlAddress() ); delete pRefreshTimerControl, pRefreshTimerControl = NULL; @@ -403,12 +403,12 @@ ScDocument::~ScDocument() DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners // BroadcastAreas vor allen Zellen zerstoeren um unnoetige // Einzel-EndListenings der Formelzellen zu vermeiden - delete pBASM; // BroadcastAreaSlotMachine + delete pBASM; // BroadcastAreaSlotMachine pBASM = NULL; if (pUnoBroadcaster) { - delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING + delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING pUnoBroadcaster = NULL; } @@ -439,12 +439,12 @@ ScDocument::~ScDocument() delete pConsolidateDlgData; delete pLinkManager; delete pClipData; - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege delete pChangeTrack; delete pEditEngine; delete pNoteEngine; SfxItemPool::Free(pNoteItemPool); - delete pChangeViewSettings; // und weg damit + delete pChangeViewSettings; // und weg damit delete pVirtualDevice_100th_mm; delete pDPCollection; @@ -483,8 +483,8 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc ) xPoolHelper = pSourceDoc->xPoolHelper; - // bedingte Formate / Gueltigkeiten - //! Vorlagen kopieren? + // bedingte Formate / Gueltigkeiten + //! Vorlagen kopieren? const ScConditionalFormatList* pSourceCond = pSourceDoc->pCondFormList; if ( pSourceCond ) pCondFormList = new ScConditionalFormatList(this, *pSourceCond); @@ -616,7 +616,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, { if ( bForceTab && !pTab[nTab] ) { - BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags + BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags pTab[nTab] = new ScTable(this, nTab, String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), @@ -635,12 +635,12 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, //UNUSED2009-05 if ( bForceTab && !pTab[nTab] ) //UNUSED2009-05 { //UNUSED2009-05 BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 pTab[nTab] = new ScTable(this, nTab, //UNUSED2009-05 String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), //UNUSED2009-05 bExtras, bExtras); //UNUSED2009-05 } -//UNUSED2009-05 +//UNUSED2009-05 //UNUSED2009-05 if (pTab[nTab]) //UNUSED2009-05 pTab[nTab]->PutCell( rPos, nFormatIndex, pCell ); //UNUSED2009-05 } @@ -748,15 +748,15 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos ) if (nTabCount > 1) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SetNoListening( TRUE ); ScProgress* pProgress = new ScProgress( GetDocumentShell(), ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), GetCodeCount() ); if (nNewPos == SC_TAB_APPEND) nNewPos = nTabCount-1; - // Referenz-Updaterei - //! mit UpdateReference zusammenfassen! + // Referenz-Updaterei + //! mit UpdateReference zusammenfassen! SCsTAB nDz = ((SCsTAB)nNewPos) - (SCsTAB)nOldPos; ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos ); @@ -790,7 +790,7 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos ) for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateMoveTab( nOldPos, nNewPos, i, *pProgress ); - delete pProgress; // freimachen fuer evtl. andere + delete pProgress; // freimachen fuer evtl. andere for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateCompile(); @@ -819,8 +819,8 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM String aName; GetName(nOldPos, aName); - // vorneweg testen, ob der Prefix als gueltig erkannt wird - // wenn nicht, nur doppelte vermeiden + // vorneweg testen, ob der Prefix als gueltig erkannt wird + // wenn nicht, nur doppelte vermeiden BOOL bPrefix = ValidTabName( aName ); DBG_ASSERT(bPrefix, "ungueltiger Tabellenname"); SCTAB nDummy; @@ -834,7 +834,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM bValid = ( !GetTable( aName, nDummy ) && (nMaxTableNumber <= MAXTAB) ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden if (bValid) { if (nNewPos == nMaxTableNumber) @@ -882,7 +882,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM if (pTab[i] && i != nOldPos && i != nNewPos) pTab[i]->StartAllListeners(); - // update conditional formats after table is inserted + // update conditional formats after table is inserted if ( pCondFormList ) pCondFormList->UpdateReference( URM_INSDEL, aRange, 0,0,1 ); if ( pValidationList ) @@ -896,16 +896,16 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM } if (bValid) { - SetNoListening( TRUE ); // noch nicht bei CopyToTable/Insert + SetNoListening( TRUE ); // noch nicht bei CopyToTable/Insert pTab[nOldPos]->CopyToTable(0, 0, MAXCOL, MAXROW, IDF_ALL, (pOnlyMarked != NULL), pTab[nNewPos], pOnlyMarked ); pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor()); SCsTAB nDz; -/* if (nNewPos < nOldPos) +/* if (nNewPos < nOldPos) nDz = ((short)nNewPos) - (short)nOldPos + 1; else -*/ nDz = ((short)nNewPos) - (short)nOldPos; +*/ nDz = ((short)nNewPos) - (short)nOldPos; pTab[nNewPos]->UpdateReference(URM_COPY, 0, 0, nNewPos , MAXCOL, MAXROW, nNewPos, 0, 0, nDz, NULL); @@ -913,7 +913,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM pTab[nOldPos]->UpdateInsertTab(nNewPos); pTab[nOldPos]->UpdateCompile(); - pTab[nNewPos]->UpdateCompile( TRUE ); // #67996# maybe already compiled in Clone, but used names need recompilation + pTab[nNewPos]->UpdateCompile( TRUE ); // #67996# maybe already compiled in Clone, but used names need recompilation SetNoListening( FALSE ); pTab[nOldPos]->StartAllListeners(); pTab[nNewPos]->StartAllListeners(); @@ -937,18 +937,18 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew, BOOL bResultsOnly ) { - ULONG nRetVal = 1; // 0 => Fehler 1 = ok + ULONG nRetVal = 1; // 0 => Fehler 1 = ok // 2 => RefBox, 3 => NameBox // 4 => beides BOOL bValid = TRUE; - if (bInsertNew) // neu einfuegen + if (bInsertNew) // neu einfuegen { String aName; pSrcDoc->GetName(nSrcPos, aName); CreateValidTabName(aName); bValid = InsertTab(nDestPos, aName); } - else // bestehende Tabelle ersetzen + else // bestehende Tabelle ersetzen { if (VALIDTAB(nDestPos) && pTab[nDestPos]) { @@ -962,12 +962,12 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, { BOOL bOldAutoCalcSrc = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SetNoListening( TRUE ); if ( bResultsOnly ) { bOldAutoCalcSrc = pSrcDoc->GetAutoCalc(); - pSrcDoc->SetAutoCalc( TRUE ); // falls was berechnet werden muss + pSrcDoc->SetAutoCalc( TRUE ); // falls was berechnet werden muss } { @@ -997,7 +997,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, std::set aUsedNames; pSrcDoc->pTab[nSrcPos]->FindRangeNamesInUse( 0, 0, MAXCOL, MAXROW, aUsedNames ); - for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch !!! + for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch !!! { ScRangeData* pSrcData = (*pSrcDoc->pRangeName)[i]; USHORT nOldIndex = pSrcData->GetIndex(); @@ -1025,7 +1025,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ScRangeData* pData = new ScRangeData( *pSrcData ); pData->SetDocument(this); if ( pRangeName->FindIndex( pData->GetIndex() ) ) - pData->SetIndex(0); // need new index, done in Insert + pData->SetIndex(0); // need new index, done in Insert if (!pRangeName->Insert(pData)) { DBG_ERROR("can't insert name"); // shouldn't happen @@ -1046,14 +1046,14 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, else { pSrcRangeNames[i] = NULL; - //aSrcRangeMap.SetPair( i, 0, 0 ); // not needed, defaulted + //aSrcRangeMap.SetPair( i, 0, 0 ); // not needed, defaulted } } if ( bRangeNameReplace ) { // first update all inserted named formulas if they contain other // range names and used indices changed - for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch + for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch { if ( pSrcRangeNames[i] ) pSrcRangeNames[i]->ReplaceRangeNamesInUse( aSrcRangeMap ); @@ -1094,7 +1094,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, pSrcDoc->SetAutoCalc( bOldAutoCalcSrc ); SetAutoCalc( bOldAutoCalc ); - // Drawing kopieren + // Drawing kopieren if (bInsertNew) TransferDrawPage( pSrcDoc, nSrcPos, nDestPos ); @@ -1117,7 +1117,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, aLibName = pSrcShell->GetBasicManager()->GetName(); pStarBASIC = pSrcShell->GetBasicManager()->GetLib( aLibName ); } - + String sCodeName; String sSource; uno::Reference< script::XLibraryContainer > xLibContainer = pSrcShell->GetBasicContainer(); @@ -1135,7 +1135,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, rtl::OUString sRTLSource; xLib->getByName( sSrcCodeName ) >>= sRTLSource; sSource = sRTLSource; - } + } VBA_InsertModule( *this, nDestPos, sCodeName, sSource ); } } @@ -1143,7 +1143,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, return nRetVal; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError) { @@ -1161,7 +1161,7 @@ void ScDocument::EraseNonUsedSharedNames(USHORT nLevel) { String aName; pRangeData->GetName(aName); - aName.Erase(0, 6); // !!! vgl. Table4, FillFormula !! + aName.Erase(0, 6); // !!! vgl. Table4, FillFormula !! USHORT nInd = (USHORT) aName.ToInt32(); if (nInd <= nLevel) { @@ -1180,7 +1180,7 @@ void ScDocument::EraseNonUsedSharedNames(USHORT nLevel) } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScDocument::SetConsolidateDlgData( const ScConsolidateParam* pData ) { @@ -1202,7 +1202,7 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) *pChangeViewSettings=rNew; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- ScFieldEditEngine* ScDocument::CreateFieldEditEngine() { @@ -1240,7 +1240,7 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) rpEditEngine = NULL; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // static ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() @@ -1248,7 +1248,7 @@ ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() return new ScRecursionHelper; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 8fea4b8af2b9..ef4917126f5c 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -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,10 +66,10 @@ #include "dociter.hxx" #include "detdata.hxx" #include "detfunc.hxx" -#include "scmod.hxx" // SC_MOD -#include "inputopt.hxx" // GetExpandRefs +#include "scmod.hxx" // SC_MOD +#include "inputopt.hxx" // GetExpandRefs #include "chartlis.hxx" -#include "sc.hrc" // SID_LINK +#include "sc.hrc" // SID_LINK #include "hints.hxx" #include "dpobject.hxx" #include "unoguard.hxx" @@ -134,8 +134,8 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove { if ( bRemoveAutoFilter ) { - // remove auto filter attribute if new db data don't contain auto filter flag - // start position is also compared, so bRemoveAutoFilter must not be set from ref-undo! + // remove auto filter attribute if new db data don't contain auto filter flag + // start position is also compared, so bRemoveAutoFilter must not be set from ref-undo! if ( pDBCollection ) { @@ -270,7 +270,7 @@ BOOL ScDocument::IsScenario( SCTAB nTab ) const { return ValidTab(nTab) && pTab[nTab] &&pTab[nTab]->IsScenario(); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsScenario(); + // return pTab[nTab]->IsScenario(); //return FALSE; } @@ -328,7 +328,7 @@ BOOL ScDocument::IsLinked( SCTAB nTab ) const return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsLinked(); // euqivalent to //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsLinked(); + // return pTab[nTab]->IsLinked(); //return FALSE; } @@ -420,15 +420,15 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab, return FALSE; } rTab = 0; - String aFilterName; // wird vom Loader gefuellt - String aOptions; // Filter-Optionen + String aFilterName; // wird vom Loader gefuellt + String aOptions; // Filter-Optionen sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0; ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 ); if ( aLoader.IsError() ) return FALSE; ScDocument* pSrcDoc = aLoader.GetDocument(); - // Tabelle kopieren + // Tabelle kopieren SCTAB nSrcTab; if ( pSrcDoc->GetTable( aTabName, nSrcTab ) ) { @@ -448,7 +448,7 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab, BOOL bWasThere = HasLink( aFileName, aFilterName, aOptions ); SetLink( rTab, SC_LINK_VALUE, aFileName, aFilterName, aOptions, aTabName, nRefreshDelay ); - if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen + if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen { ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay ); pLink->SetInCreate( TRUE ); @@ -588,8 +588,8 @@ BOOL ScDocument::SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->SetOutlineTable(pNewOutline); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->SetOutlineTable(pNewOutline); + // if (pTab[nTab]) + // return pTab[nTab]->SetOutlineTable(pNewOutline); //return FALSE; } @@ -605,7 +605,7 @@ BOOL ScDocument::TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->TestRemoveSubTotals( rParam ); //if (VALIDTAB(nTab) && pTab[nTab] ) - // return pTab[nTab]->TestRemoveSubTotals( rParam ); + // return pTab[nTab]->TestRemoveSubTotals( rParam ); //return FALSE; } @@ -620,8 +620,8 @@ BOOL ScDocument::DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ) { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->DoSubTotals( rParam ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->DoSubTotals( rParam ); + // if (pTab[nTab]) + // return pTab[nTab]->DoSubTotals( rParam ); //return FALSE; } @@ -637,11 +637,11 @@ BOOL ScDocument::HasSubTotalCells( const ScRange& rRange ) pCell = aIter.GetNext(); } - return FALSE; // none found + return FALSE; // none found } -// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc -// auch Zellen stehen, nach pDestDoc +// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc +// auch Zellen stehen, nach pDestDoc void ScDocument::CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ) { @@ -655,18 +655,18 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario { if (ValidTab(nSrcTab) && ValidTab(nDestTab) && pTab[nSrcTab] && pTab[nDestTab]) { - // Flags fuer aktive Szenarios richtig setzen - // und aktuelle Werte in bisher aktive Szenarios zurueckschreiben + // Flags fuer aktive Szenarios richtig setzen + // und aktuelle Werte in bisher aktive Szenarios zurueckschreiben ScRangeList aRanges = *pTab[nSrcTab]->GetScenarioRanges(); const ULONG nRangeCount = aRanges.Count(); - // nDestTab ist die Zieltabelle + // nDestTab ist die Zieltabelle for ( SCTAB nTab = nDestTab+1; nTab<=MAXTAB && pTab[nTab] && pTab[nTab]->IsScenario(); nTab++ ) { - if ( pTab[nTab]->IsActiveScenario() ) // auch wenn's dasselbe Szenario ist + if ( pTab[nTab]->IsActiveScenario() ) // auch wenn's dasselbe Szenario ist { BOOL bTouched = FALSE; for ( ULONG nR=0; nRSetActiveScenario(TRUE); // da kommt's her... - if (!bNewScenario) // Daten aus dem ausgewaehlten Szenario kopieren + pTab[nSrcTab]->SetActiveScenario(TRUE); // da kommt's her... + if (!bNewScenario) // Daten aus dem ausgewaehlten Szenario kopieren { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden pTab[nSrcTab]->CopyScenarioTo( pTab[nDestTab] ); SetDirty(); SetAutoCalc( bOldAutoCalc ); @@ -712,7 +712,7 @@ BOOL ScDocument::HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const { return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->HasScenarioRange( rRange ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->HasScenarioRange( rRange ); + // return pTab[nTab]->HasScenarioRange( rRange ); //return FALSE; } @@ -729,7 +729,7 @@ BOOL ScDocument::IsActiveScenario( SCTAB nTab ) const { return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsActiveScenario( ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsActiveScenario(); + // return pTab[nTab]->IsActiveScenario(); //return FALSE; } @@ -765,29 +765,29 @@ void ScDocument::RemoveUnoObject( SfxListener& rObject ) if ( bInUnoBroadcast ) { - // #107294# Broadcasts from ScDocument::BroadcastUno are the only way that - // uno object methods are called without holding a reference. + // #107294# Broadcasts from ScDocument::BroadcastUno are the only way that + // uno object methods are called without holding a reference. // - // If RemoveUnoObject is called from an object dtor in the finalizer thread - // while the main thread is calling BroadcastUno, the dtor thread must wait - // (or the object's Notify might try to access a deleted object). - // The SolarMutex can't be locked here because if a component is called from - // a VCL event, the main thread has the SolarMutex locked all the time. + // If RemoveUnoObject is called from an object dtor in the finalizer thread + // while the main thread is calling BroadcastUno, the dtor thread must wait + // (or the object's Notify might try to access a deleted object). + // The SolarMutex can't be locked here because if a component is called from + // a VCL event, the main thread has the SolarMutex locked all the time. // - // This check is done after calling EndListening, so a later BroadcastUno call - // won't touch this object. + // This check is done after calling EndListening, so a later BroadcastUno call + // won't touch this object. vos::IMutex& rSolarMutex = Application::GetSolarMutex(); if ( rSolarMutex.tryToAcquire() ) { - // BroadcastUno is always called with the SolarMutex locked, so if it - // can be acquired, this is within the same thread (should not happen) + // BroadcastUno is always called with the SolarMutex locked, so if it + // can be acquired, this is within the same thread (should not happen) DBG_ERRORFILE( "RemoveUnoObject called from BroadcastUno" ); rSolarMutex.release(); } else { - // let the thread that called BroadcastUno continue + // let the thread that called BroadcastUno continue while ( bInUnoBroadcast ) { vos::OThread::yield(); @@ -968,9 +968,9 @@ void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDo aSource.aEnd.SetTab( nClipTab ); aDest.SetTab( nDestTab ); - // wie UpdateReference + // wie UpdateReference - pRangeName->UpdateTranspose( aSource, aDest ); // vor den Zellen! + pRangeName->UpdateTranspose( aSource, aDest ); // vor den Zellen! for (SCTAB i=0; i<=MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateTranspose( aSource, aDest, pUndoDoc ); @@ -981,9 +981,9 @@ void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDo void ScDocument::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) { - //! pDBCollection - //! pPivotCollection - //! UpdateChartRef + //! pDBCollection + //! pPivotCollection + //! UpdateChartRef pRangeName->UpdateGrow( rArea, nGrowX, nGrowY ); @@ -1131,7 +1131,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc) { - //! getrennte Markierungen pro Tabelle verwalten !!!!!!!!!!!!! + //! getrennte Markierungen pro Tabelle verwalten !!!!!!!!!!!!! rMark.MarkToMulti(); @@ -1157,7 +1157,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, } } - // Markierung wird innen schon komplett gesetzt + // Markierung wird innen schon komplett gesetzt } else { @@ -1210,7 +1210,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, return bFound; } -// Outline anpassen +// Outline anpassen BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ) { @@ -1280,8 +1280,8 @@ BOOL ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n BOOL ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab ) { - ScDBData* pDBData = GetDBAtCursor( nCurCol, nCurRow, nCurTab ); - BOOL bHasAutoFilter = ( pDBData != NULL ); + ScDBData* pDBData = GetDBAtCursor( nCurCol, nCurRow, nCurTab ); + BOOL bHasAutoFilter = ( pDBData != NULL ); if ( pDBData ) { @@ -1317,8 +1317,8 @@ BOOL ScDocument::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); + // if (pTab[nTab]) + // return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //return FALSE; } @@ -1328,14 +1328,14 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); + // if (pTab[nTab]) + // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //return FALSE; } // -// GetFilterEntries - Eintraege fuer AutoFilter-Listbox +// GetFilterEntries - Eintraege fuer AutoFilter-Listbox // BOOL ScDocument::GetFilterEntries( @@ -1343,7 +1343,7 @@ BOOL ScDocument::GetFilterEntries( { if ( ValidTab(nTab) && pTab[nTab] && pDBCollection ) { - ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!?? + ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!?? if (pDBData) { SCTAB nAreaTab; @@ -1391,7 +1391,7 @@ BOOL ScDocument::GetFilterEntries( } // -// GetFilterEntriesArea - Eintraege fuer Filter-Dialog +// GetFilterEntriesArea - Eintraege fuer Filter-Dialog // BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, @@ -1407,7 +1407,7 @@ BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRo } // -// GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) +// GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) // BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -1429,26 +1429,26 @@ BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); + // return pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); //return FALSE; } // -// GetFormulaEntries - Eintraege fuer Formel-AutoEingabe +// GetFormulaEntries - Eintraege fuer Formel-AutoEingabe // -// Funktionen werden als 1 schon vom InputHandler eingefuegt -#define SC_STRTYPE_NAMES 2 -#define SC_STRTYPE_DBNAMES 3 -#define SC_STRTYPE_HEADERS 4 +// Funktionen werden als 1 schon vom InputHandler eingefuegt +#define SC_STRTYPE_NAMES 2 +#define SC_STRTYPE_DBNAMES 3 +#define SC_STRTYPE_HEADERS 4 BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) { USHORT i; // - // Bereichsnamen + // Bereichsnamen // if ( pRangeName ) @@ -1467,7 +1467,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) } // - // Datenbank-Bereiche + // Datenbank-Bereiche // if ( pDBCollection ) @@ -1486,7 +1486,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) } // - // Inhalte von Beschriftungsbereichen + // Inhalte von Beschriftungsbereichen // ScRangePairList* pLists[2]; @@ -1525,7 +1525,7 @@ void ScDocument::GetEmbedded( ScRange& rRange ) const rRange = aEmbedRange; } -Rectangle ScDocument::GetEmbeddedRect() const // 1/100 mm +Rectangle ScDocument::GetEmbeddedRect() const // 1/100 mm { Rectangle aRect; ScTable* pTable = pTab[aEmbedRange.aStart.Tab()]; @@ -1567,7 +1567,7 @@ void ScDocument::ResetEmbedded() } -/** Similar to ScViewData::AddPixelsWhile(), but add height twips and only +/** Similar to ScViewData::AddPixelsWhile(), but add height twips and only while result is less than nStopTwips. @return TRUE if advanced at least one row. */ @@ -1625,7 +1625,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) Rectangle aPosRect = rMMRect; if ( IsNegativePage( nTab ) ) - ScDrawLayer::MirrorRectRTL( aPosRect ); // always with positive (LTR) values + ScDrawLayer::MirrorRectRTL( aPosRect ); // always with positive (LTR) values long nSize; long nTwips; @@ -1684,13 +1684,13 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) return ScRange( nX1,nY1,nTab, nX2,nY2,nTab ); } -void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (1/100 mm) +void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (1/100 mm) { bIsEmbedded = TRUE; aEmbedRange = GetRange( nVisibleTab, rRect ); } -// VisArea auf Zellgrenzen anpassen +// VisArea auf Zellgrenzen anpassen void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol ) { @@ -1724,7 +1724,7 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) SCROW nLastRow; if (pTable->RowHidden(i, NULL, &nLastRow)) { - i = nLastRow; + i = nLastRow; continue; } @@ -1737,7 +1737,7 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) } else { - bFound = true; + bFound = true; break; } } @@ -1763,12 +1763,12 @@ void ScDocument::SnapVisArea( Rectangle& rRect ) const SCCOL nCol = 0; lcl_SnapHor( pTable, rRect.Left(), nCol ); - ++nCol; // mindestens eine Spalte + ++nCol; // mindestens eine Spalte lcl_SnapHor( pTable, rRect.Right(), nCol ); SCROW nRow = 0; lcl_SnapVer( pTable, rRect.Top(), nRow ); - ++nRow; // mindestens eine Zeile + ++nRow; // mindestens eine Zeile lcl_SnapVer( pTable, rRect.Bottom(), nRow ); if ( bNegativePage ) @@ -1878,7 +1878,7 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy pPool->SetPoolDefaultItem( SvxLanguageItem( eCtlLanguage, ATTR_CTL_FONT_LANGUAGE ) ); } - UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool + UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool } void ScDocument::SetDrawDefaults() @@ -1910,10 +1910,10 @@ Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow, aRect.Right() += GetColWidth(i,nTab); aRect.Bottom() += GetRowHeight( nStartRow, nEndRow, nTab); - aRect.Left() = (long)(aRect.Left() * HMM_PER_TWIPS); - aRect.Right() = (long)(aRect.Right() * HMM_PER_TWIPS); - aRect.Top() = (long)(aRect.Top() * HMM_PER_TWIPS); - aRect.Bottom() = (long)(aRect.Bottom() * HMM_PER_TWIPS); + aRect.Left() = (long)(aRect.Left() * HMM_PER_TWIPS); + aRect.Right() = (long)(aRect.Right() * HMM_PER_TWIPS); + aRect.Top() = (long)(aRect.Top() * HMM_PER_TWIPS); + aRect.Bottom() = (long)(aRect.Bottom() * HMM_PER_TWIPS); if ( IsNegativePage( nTab ) ) ScDrawLayer::MirrorRectRTL( aRect ); @@ -2012,7 +2012,7 @@ void ScDocument::DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos ) // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance -ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) +ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) { for ( std::list::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) { // @@ -2022,7 +2022,7 @@ ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) return NULL; } -ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) +ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) { ScDPTableDataCache* pCache = NULL; USHORT nCount = GetDPCollection()->GetCount(); @@ -2042,7 +2042,7 @@ ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) } long ScDocument::AddDPObjectCache( ScDPTableDataCache* pData ) -{ +{ if ( pData->GetId() < 0 ) { //create a id for it pData->SetId( GetNewDPObjectCacheId() ); @@ -2077,10 +2077,10 @@ long ScDocument::GetNewDPObjectCacheId() void ScDocument::RemoveDPObjectCache( long nID ) { for ( std::list::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { if ( nID == (*iter)->GetId() ) { - ScDPTableDataCache* pCache = *iter; + ScDPTableDataCache* pCache = *iter; m_listDPObjectsCaches.erase( iter ); delete pCache; break; @@ -2090,9 +2090,9 @@ void ScDocument::RemoveDPObjectCache( long nID ) } void ScDocument::RemoveUnusedDPObjectCaches() -{ +{ for ( std::list::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { long nID = (*iter)->GetId(); USHORT nCount = GetDPCollection()->GetCount(); USHORT i ; @@ -2103,7 +2103,7 @@ void ScDocument::RemoveUnusedDPObjectCaches() } if ( i == nCount ) { - ScDPTableDataCache* pCache = *iter; + ScDPTableDataCache* pCache = *iter; m_listDPObjectsCaches.erase( iter ); delete pCache; continue; @@ -2114,10 +2114,10 @@ void ScDocument::RemoveUnusedDPObjectCaches() void ScDocument::GetUsedDPObjectCache( std::list& usedlist ) { for ( std::list::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { long nID = (*iter)->GetId(); USHORT nCount = GetDPCollection()->GetCount(); - USHORT i=0; + USHORT i=0; for ( i=0; iGetCacheId() ) break; diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 148cc367534c..cbd55fd5fe14 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -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 @@ -112,7 +112,7 @@ BOOL ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, pCell->Interpret(); USHORT nErrCode = pCell->GetErrCode(); nX = pCell->GetValueAlways(); - if (nErrCode == 0) // kein fehler beim Rechnen + if (nErrCode == 0) // kein fehler beim Rechnen bRet = TRUE; delete pCell; } @@ -135,7 +135,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCROW k; i = 0; BOOL bStop = FALSE; - while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden + while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden { if (pTab[i] && rMark.GetTableSelect(i)) bStop = TRUE; @@ -196,7 +196,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, { for (k = nRow1; k <= nRow2; k++) { - if (j != nCol1 || k != nRow1) // nicht in der ersten Zelle + if (j != nCol1 || k != nRow1) // nicht in der ersten Zelle { // Array muss geklont werden, damit jede // Zelle ein eigenes Array erhaelt! @@ -222,7 +222,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera SCROW k; i = 0; BOOL bStop = FALSE; - while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden + while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden { if (pTab[i] && rMark.GetTableSelect(i)) bStop = TRUE; @@ -243,11 +243,11 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera aForString += ScCompiler::GetNativeSymbol( ocOpen); const String& sSep = ScCompiler::GetNativeSymbol( ocSep); - if (rParam.nMode == 0) // nur Spalte + if (rParam.nMode == 0) // nur Spalte { aRef.Set( rParam.aRefFormulaCell.GetAddress(), TRUE, FALSE, FALSE ); aForString += aRef.GetRefString(this, nTab1); - aForString += sSep; + aForString += sSep; aForString += rParam.aRefColCell.GetRefString(this, nTab1); aForString += sSep; aRef.Set( nCol1, nRow1, nTab1, FALSE, TRUE, TRUE ); @@ -256,7 +256,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera nCol2 = Min( nCol2, (SCCOL)(rParam.aRefFormulaEnd.Col() - rParam.aRefFormulaCell.Col() + nCol1 + 1)); } - else if (rParam.nMode == 1) // nur zeilenweise + else if (rParam.nMode == 1) // nur zeilenweise { aRef.Set( rParam.aRefFormulaCell.GetAddress(), FALSE, TRUE, FALSE ); aForString += aRef.GetRefString(this, nTab1); @@ -269,7 +269,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera nRow2 = Min( nRow2, (SCROW)(rParam.aRefFormulaEnd.Row() - rParam.aRefFormulaCell.Row() + nRow1 + 1)); } - else // beides + else // beides { aForString += rParam.aRefFormulaCell.GetRefString(this, nTab1); aForString += sSep; @@ -312,20 +312,20 @@ bool ScDocument::MarkUsedExternalReferences( ScTokenArray & rArr ) switch (t->GetType()) { case svExternalSingleRef: - bAllMarked = pRefMgr->setCacheTableReferenced( + bAllMarked = pRefMgr->setCacheTableReferenced( t->GetIndex(), t->GetString(), 1); break; case svExternalDoubleRef: { const ScComplexRefData& rRef = t->GetDoubleRef(); size_t nSheets = rRef.Ref2.nTab - rRef.Ref1.nTab + 1; - bAllMarked = pRefMgr->setCacheTableReferenced( + bAllMarked = pRefMgr->setCacheTableReferenced( t->GetIndex(), t->GetString(), nSheets); } break; case svExternalName: - /* TODO: external names aren't supported yet, but would - * have to be marked as well, if so. Mechanism would be + /* TODO: external names aren't supported yet, but would + * have to be marked as well, if so. Mechanism would be * different. */ DBG_ERRORFILE("ScDocument::MarkUsedExternalReferences: implement the svExternalName case!"); break; @@ -385,7 +385,7 @@ void ScDocument::CompileDBFormula( BOOL bCreateFormulaString ) void ScDocument::CompileNameFormula( BOOL bCreateFormulaString ) { if ( pCondFormList ) - pCondFormList->CompileAll(); // nach ScNameDlg noetig + pCondFormList->CompileAll(); // nach ScNameDlg noetig for (SCTAB i=0; i<=MAXTAB; i++) { @@ -461,7 +461,7 @@ BOOL ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc, pTab[nTab]->UpdateSelectionFunction( aData, nStartCol, nStartRow, nEndCol, nEndRow, rMark ); - //! rMark an UpdateSelectionFunction uebergeben !!!!! + //! rMark an UpdateSelectionFunction uebergeben !!!!! if (!aData.bError) switch (eFunc) @@ -510,10 +510,10 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) nPrecision = (short)GetFormatTable()->GetFormatPrecision( nFormat ); switch ( nType ) { - case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041 + case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041 nPrecision += 2; break; - case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123 + case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123 { if ( fVal > 0.0 ) nPrecision = sal::static_int_cast( nPrecision - (short)floor( log10( fVal ) ) ); @@ -527,7 +527,7 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) nPrecision = (short)GetDocOptions().GetStdPrecision(); double fRound = ::rtl::math::round( fVal, nPrecision ); if ( ::rtl::math::approxEqual( fVal, fRound ) ) - return fVal; // durch Rundung hoechstens Fehler + return fVal; // durch Rundung hoechstens Fehler else return fRound; } @@ -536,13 +536,13 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) } // -// bedingte Formate und Gueltigkeitsbereiche +// bedingte Formate und Gueltigkeitsbereiche // ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew ) { if (rNew.IsEmpty()) - return 0; // leer ist immer 0 + return 0; // leer ist immer 0 if (!pCondFormList) pCondFormList = new ScConditionalFormatList; @@ -571,7 +571,7 @@ ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew ) ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew ) { if (rNew.IsEmpty()) - return 0; // leer ist immer 0 + return 0; // leer ist immer 0 if (!pValidationList) pValidationList = new ScValidationDataList; @@ -667,7 +667,7 @@ const ScConditionalFormat* ScDocument::GetCondFormat( return NULL; } -const ScValidationData* ScDocument::GetValidationEntry( ULONG nIndex ) const +const ScValidationData* ScDocument::GetValidationEntry( ULONG nIndex ) const { if ( pValidationList ) return pValidationList->GetData( nIndex ); @@ -689,7 +689,7 @@ void ScDocument::FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB void ScDocument::ConditionalChanged( ULONG nKey ) { - if ( nKey && pCondFormList && !bIsClip && !bIsUndo ) // nKey==0 -> noop + if ( nKey && pCondFormList && !bIsClip && !bIsUndo ) // nKey==0 -> noop { ScConditionalFormat* pForm = pCondFormList->GetFormat( nKey ); if (pForm) @@ -725,27 +725,27 @@ void ScDocument::AddDetectiveOperation( const ScDetOpData& rData ) void ScDocument::ClearDetectiveOperations() { - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege pDetOpList = NULL; } void ScDocument::SetDetOpList(ScDetOpList* pNew) { - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege pDetOpList = pNew; } //------------------------------------------------------------------------ // -// Vergleich von Dokumenten +// Vergleich von Dokumenten // //------------------------------------------------------------------------ -// Pfriemel-Faktoren -#define SC_DOCCOMP_MAXDIFF 256 -#define SC_DOCCOMP_MINGOOD 128 -#define SC_DOCCOMP_COLUMNS 10 -#define SC_DOCCOMP_ROWS 100 +// Pfriemel-Faktoren +#define SC_DOCCOMP_MAXDIFF 256 +#define SC_DOCCOMP_MINGOOD 128 +#define SC_DOCCOMP_COLUMNS 10 +#define SC_DOCCOMP_ROWS 100 USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, @@ -762,7 +762,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, else nOtherCol = nThisCol; - if (ValidCol(nOtherCol)) // nur Spalten vergleichen, die in beiden Dateien sind + if (ValidCol(nOtherCol)) // nur Spalten vergleichen, die in beiden Dateien sind { const ScBaseCell* pThisCell = GetCell( ScAddress( nThisCol, nThisRow, nThisTab ) ); const ScBaseCell* pOtherCell = rOtherDoc.GetCell( ScAddress( nOtherCol, nOtherRow, nOtherTab ) ); @@ -771,7 +771,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, if ( pThisCell && pOtherCell ) nDif += 3; else - nDif += 4; // Inhalt <-> leer zaehlt mehr + nDif += 4; // Inhalt <-> leer zaehlt mehr } if ( ( pThisCell && pThisCell->GetCellType()!=CELLTYPE_NOTE ) || @@ -781,7 +781,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, } if (nUsed > 0) - return static_cast((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF) + return static_cast((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF) DBG_ASSERT(!nDif,"Diff ohne Used"); return 0; @@ -791,7 +791,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab, SCROW nMaxRow, SCCOLROW* pOtherRows ) { - //! optimieren mit Iterator oder so + //! optimieren mit Iterator oder so ULONG nDif = 0; ULONG nUsed = 0; @@ -803,7 +803,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, else nOtherRow = nThisRow; - if (ValidRow(nOtherRow)) // nur Zeilen vergleichen, die in beiden Dateien sind + if (ValidRow(nOtherRow)) // nur Zeilen vergleichen, die in beiden Dateien sind { const ScBaseCell* pThisCell = GetCell( ScAddress( nThisCol, nThisRow, nThisTab ) ); const ScBaseCell* pOtherCell = rOtherDoc.GetCell( ScAddress( nOtherCol, nOtherRow, nOtherTab ) ); @@ -812,7 +812,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, if ( pThisCell && pOtherCell ) nDif += 3; else - nDif += 4; // Inhalt <-> leer zaehlt mehr + nDif += 4; // Inhalt <-> leer zaehlt mehr } if ( ( pThisCell && pThisCell->GetCellType()!=CELLTYPE_NOTE ) || @@ -822,7 +822,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, } if (nUsed > 0) - return static_cast((nDif*64)/nUsed); // max.256 + return static_cast((nDif*64)/nUsed); // max.256 DBG_ASSERT(!nDif,"Diff ohne Used"); return 0; @@ -832,28 +832,28 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW BOOL bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab, SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, ULONG nProAdd ) { - // bColumns=TRUE: Zeilen sind Spalten und umgekehrt + // bColumns=TRUE: Zeilen sind Spalten und umgekehrt - SCCOLROW nMaxCont; // wieviel weiter - SCCOLROW nMinGood; // was ist ein Treffer (incl.) + SCCOLROW nMaxCont; // wieviel weiter + SCCOLROW nMinGood; // was ist ein Treffer (incl.) if ( bColumns ) { - nMaxCont = SC_DOCCOMP_COLUMNS; // 10 Spalten + nMaxCont = SC_DOCCOMP_COLUMNS; // 10 Spalten nMinGood = SC_DOCCOMP_MINGOOD; - //! Extra Durchgang mit nMinGood = 0 ???? + //! Extra Durchgang mit nMinGood = 0 ???? } else { - nMaxCont = SC_DOCCOMP_ROWS; // 100 Zeilen + nMaxCont = SC_DOCCOMP_ROWS; // 100 Zeilen nMinGood = SC_DOCCOMP_MINGOOD; } - BOOL bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang + BOOL bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang SCCOLROW nOtherRow = 0; USHORT nComp; SCCOLROW nThisRow; - BOOL bTotal = FALSE; // ueber verschiedene nThisRow beibehalten + BOOL bTotal = FALSE; // ueber verschiedene nThisRow beibehalten SCCOLROW nUnknown = 0; for (nThisRow = 0; nThisRow <= nThisEndRow; nThisRow++) { @@ -861,7 +861,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW BOOL bFound = FALSE; USHORT nBest = SC_DOCCOMP_MAXDIFF; SCCOLROW nMax = Min( nOtherEndRow, static_cast(( nTempOther + nMaxCont + nUnknown )) ); - for (SCCOLROW i=nTempOther; i<=nMax && nBest>0; i++) // bei 0 abbrechen + for (SCCOLROW i=nTempOther; i<=nMax && nBest>0; i++) // bei 0 abbrechen { if (bColumns) nComp = ColDifferences( static_cast(nThisRow), nThisTab, rOtherDoc, static_cast(i), nOtherTab, nEndCol, pTranslate ); @@ -876,7 +876,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW if ( nComp < SC_DOCCOMP_MAXDIFF || bFound ) bTotal = FALSE; else if ( i == nTempOther && bUseTotal ) - bTotal = TRUE; // nur ganz oben + bTotal = TRUE; // nur ganz oben } if ( bFound ) { @@ -894,7 +894,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW pProgress->SetStateOnPercent(nProAdd+static_cast(nThisRow)); } - // Bloecke ohne Uebereinstimmung ausfuellen + // Bloecke ohne Uebereinstimmung ausfuellen SCROW nFillStart = 0; SCROW nFillPos = 0; @@ -906,7 +906,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW { if ( bInFill ) { - if ( nThisOther > nFillStart ) // ist was zu verteilen da? + if ( nThisOther > nFillStart ) // ist was zu verteilen da? { SCROW nDiff1 = nThisOther - nFillStart; SCROW nDiff2 = nThisRow - nFillPos; @@ -935,13 +935,13 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB* pOtherTabs = new SCTAB[nThisCount]; SCTAB nThisTab; - // Tabellen mit gleichen Namen vergleichen + // Tabellen mit gleichen Namen vergleichen String aThisName; String aOtherName; for (nThisTab=0; nThisTabMAXTAB; nTemp++) @@ -954,7 +954,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } pOtherTabs[nThisTab] = nOtherTab; } - // auffuellen, damit einzeln umbenannte Tabellen nicht wegfallen + // auffuellen, damit einzeln umbenannte Tabellen nicht wegfallen SCTAB nFillStart = 0; SCTAB nFillPos = 0; BOOL bInFill = FALSE; @@ -965,7 +965,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) { if ( bInFill ) { - if ( nThisOther > nFillStart ) // ist was zu verteilen da? + if ( nThisOther > nFillStart ) // ist was zu verteilen da? { SCTAB nDiff1 = nThisOther - nFillStart; SCTAB nDiff2 = nThisTab - nFillPos; @@ -985,7 +985,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } // - // Tabellen in der gefundenen Reihenfolge vergleichen + // Tabellen in der gefundenen Reihenfolge vergleichen // for (nThisTab=0; nThisTab= nMatch2 ) // ohne Spalten ? + if ( nMatch1 >= nMatch2 ) // ohne Spalten ? { - // Spalten zuruecksetzen + // Spalten zuruecksetzen for (nThisCol = 0; nThisCol<=nThisEndCol; nThisCol++) pOtherCols[nThisCol] = nThisCol; - // Zeilenarrays vertauschen (geloescht werden sowieso beide) + // Zeilenarrays vertauschen (geloescht werden sowieso beide) SCCOLROW* pSwap = pTempRows; pTempRows = pOtherRows; pOtherRows = pSwap; } else { - // bleibt bei pOtherCols, pOtherRows + // bleibt bei pOtherCols, pOtherRows } - // Change-Actions erzeugen - // 1) Spalten von rechts - // 2) Zeilen von unten - // 3) einzelne Zellen in normaler Reihenfolge + // Change-Actions erzeugen + // 1) Spalten von rechts + // 2) Zeilen von unten + // 3) einzelne Zellen in normaler Reihenfolge - // Actions fuer eingefuegte/geloeschte Spalten + // Actions fuer eingefuegte/geloeschte Spalten SCCOL nLastOtherCol = static_cast(nOtherEndCol + 1); - // nThisEndCol ... 0 + // nThisEndCol ... 0 for ( nThisCol = nThisEndCol+1; nThisCol > 0; ) { --nThisCol; @@ -1089,9 +1089,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) nLastOtherCol-1, MAXROW, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - if ( nOtherCol > MAXCOL ) // eingefuegt + if ( nOtherCol > MAXCOL ) // eingefuegt { - // zusammenfassen + // zusammenfassen if ( nThisCol == nThisEndCol || ValidCol(static_cast(pOtherCols[nThisCol+1])) ) { SCCOL nFirstNew = static_cast(nThisCol); @@ -1106,17 +1106,17 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) else nLastOtherCol = nOtherCol; } - if ( nLastOtherCol > 0 ) // ganz oben geloescht + if ( nLastOtherCol > 0 ) // ganz oben geloescht { ScRange aDelRange( 0, 0, nOtherTab, nLastOtherCol-1, MAXROW, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - // Actions fuer eingefuegte/geloeschte Zeilen + // Actions fuer eingefuegte/geloeschte Zeilen SCROW nLastOtherRow = nOtherEndRow + 1; - // nThisEndRow ... 0 + // nThisEndRow ... 0 for ( nThisRow = nThisEndRow+1; nThisRow > 0; ) { --nThisRow; @@ -1128,9 +1128,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) MAXCOL, nLastOtherRow-1, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - if ( nOtherRow > MAXROW ) // eingefuegt + if ( nOtherRow > MAXROW ) // eingefuegt { - // zusammenfassen + // zusammenfassen if ( nThisRow == nThisEndRow || ValidRow(pOtherRows[nThisRow+1]) ) { SCROW nFirstNew = nThisRow; @@ -1145,14 +1145,14 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) else nLastOtherRow = nOtherRow; } - if ( nLastOtherRow > 0 ) // ganz oben geloescht + if ( nLastOtherRow > 0 ) // ganz oben geloescht { ScRange aDelRange( 0, 0, nOtherTab, MAXCOL, nLastOtherRow-1, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - // Zeilen durchgehen um einzelne Zellen zu finden + // Zeilen durchgehen um einzelne Zellen zu finden for (nThisRow = 0; nThisRow <= nThisEndRow; nThisRow++) { @@ -1186,8 +1186,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } } - //! Inhalt von eingefuegten / geloeschten Tabellen ??? - //! Aktionen fuer eingefuegte / geloeschte Tabellen ??? + //! Inhalt von eingefuegten / geloeschten Tabellen ??? + //! Aktionen fuer eingefuegte / geloeschte Tabellen ??? delete[] pOtherTabs; } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index d86d174ab414..f53d2a14b688 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -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 @@ -48,10 +48,10 @@ #include #include -//REMOVE #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVINPLACEOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvInPlaceObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVINPLACEOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvInPlaceObject) +//REMOVE #endif #include "document.hxx" #include "drwlayer.hxx" @@ -136,7 +136,7 @@ void ScDocument::UpdateAllCharts() USHORT nDataCount = pChartCollection->GetCount(); if ( !nDataCount ) - return ; // nothing to do + return ; // nothing to do USHORT nPos; @@ -237,7 +237,7 @@ BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName ) if (pName) pName->Erase(); - return FALSE; // nix gefunden + return FALSE; // nix gefunden } void ScDocument::UpdateChartArea( const String& rChartName, @@ -441,7 +441,7 @@ void ScDocument::UpdateChartArea( const String& rChartName, // ((SdrOle2Obj*)pObject)->GetNewReplacement(); // pObject->ActionChanged(); - return; // nicht weitersuchen + return; // nicht weitersuchen } } pObject = aIter.Next(); @@ -560,7 +560,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, { #if 0 if ( nDz != 0 ) - { // #81844# sheet to be deleted or inserted or moved + { // #81844# sheet to be deleted or inserted or moved // => no valid sheet names for references right now pChartListener->ChangeListening( aNewRLR, bDataChanged ); pChartListener->ScheduleSeriesRanges(); @@ -568,8 +568,8 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, else #endif { -// SetChartRangeList( pChartListener->GetString(), aNewRLR ); -// pChartListener->ChangeListening( aNewRLR, bDataChanged ); +// SetChartRangeList( pChartListener->GetString(), aNewRLR ); +// pChartListener->ChangeListening( aNewRLR, bDataChanged ); // Force the chart to be loaded now, so it registers itself for UNO events. // UNO broadcasts are done after UpdateChartRef, so the chart will get this @@ -648,9 +648,9 @@ uno::Reference< embed::XEmbeddedObject > if (!pDrawLayer) return uno::Reference< embed::XEmbeddedObject >(); - // die Seiten hier vom Draw-Layer nehmen, - // weil sie evtl. nicht mit den Tabellen uebereinstimmen - // (z.B. Redo von Tabelle loeschen, Draw-Redo passiert vor DeleteTab). + // die Seiten hier vom Draw-Layer nehmen, + // weil sie evtl. nicht mit den Tabellen uebereinstimmen + // (z.B. Redo von Tabelle loeschen, Draw-Redo passiert vor DeleteTab). sal_uInt16 nCount = pDrawLayer->GetPageCount(); for (sal_uInt16 nTab=0; nTabgetScriptType( aText, nPos ); if ( nType == i18n::ScriptType::WEAK ) - return TRUE; // found + return TRUE; // found nPos = xBreakIter->endOfScript( aText, nPos, nType ); } @@ -92,7 +92,7 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString ) } } - return FALSE; // none found + return FALSE; // none found } BYTE ScDocument::GetStringScriptType( const String& rString ) @@ -135,11 +135,11 @@ BYTE ScDocument::GetStringScriptType( const String& rString ) BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ) { if ( !pCell ) - return 0; // empty + return 0; // empty BYTE nStored = pCell->GetScriptType(); - if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? - return nStored; // use stored value + if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? + return nStored; // use stored value String aStr; Color* pColor; @@ -147,7 +147,7 @@ BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ) BYTE nRet = GetStringScriptType( aStr ); - pCell->SetScriptType( nRet ); // store for later calls + pCell->SetScriptType( nRet ); // store for later calls return nRet; } @@ -160,14 +160,14 @@ BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* { pCell = GetCell( ScAddress( nCol, nRow, nTab ) ); if ( !pCell ) - return 0; // empty + return 0; // empty } // if script type is set, don't have to get number formats BYTE nStored = pCell->GetScriptType(); - if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? - return nStored; // use stored value + if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? + return nStored; // use stored value // include number formats from conditional formatting diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index d77dc1041d9c..96484dc2f129 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -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 @@ -43,14 +43,14 @@ #include "brdcst.hxx" #include "bcaslot.hxx" #include "cell.hxx" -#include "formula/errorcodes.hxx" // errCircularReference +#include "formula/errorcodes.hxx" // errCircularReference #include "scerrors.hxx" #include "docoptio.hxx" #include "refupdat.hxx" #include "table.hxx" #include "progress.hxx" -#include "scmod.hxx" // SC_MOD -#include "inputopt.hxx" // GetExpandRefs +#include "scmod.hxx" // SC_MOD +#include "inputopt.hxx" // GetExpandRefs #include "conditio.hxx" #include "sheetevents.hxx" #include @@ -58,7 +58,7 @@ #include "globstr.hrc" -extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround +extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround // STATIC DATA ----------------------------------------------------------- @@ -92,7 +92,7 @@ void ScDocument::Broadcast( ULONG nHint, const ScAddress& rAddr, ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo ScHint aHint( nHint, rAddr, pCell ); Broadcast( aHint ); } @@ -101,7 +101,7 @@ void ScDocument::Broadcast( ULONG nHint, const ScAddress& rAddr, void ScDocument::Broadcast( const ScHint& rHint ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo if ( !nHardRecalcState ) { ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast @@ -120,7 +120,7 @@ void ScDocument::Broadcast( const ScHint& rHint ) TrackFormulas( rHint.GetId() ); } - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList && rHint.GetAddress() != BCA_BRDCST_ALWAYS ) pCondFormList->SourceChanged( rHint.GetAddress() ); @@ -136,7 +136,7 @@ void ScDocument::Broadcast( const ScHint& rHint ) void ScDocument::AreaBroadcast( const ScHint& rHint ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo if ( !nHardRecalcState ) { ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast @@ -144,7 +144,7 @@ void ScDocument::AreaBroadcast( const ScHint& rHint ) TrackFormulas( rHint.GetId() ); } - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList && rHint.GetAddress() != BCA_BRDCST_ALWAYS ) pCondFormList->SourceChanged( rHint.GetAddress() ); } @@ -226,7 +226,7 @@ void ScDocument::PutInFormulaTree( ScFormulaCell* pCell ) if ( pEOFormulaTree ) pEOFormulaTree->SetNext( pCell ); else - pFormulaTree = pCell; // kein Ende, kein Anfang.. + pFormulaTree = pCell; // kein Ende, kein Anfang.. pCell->SetPrevious( pEOFormulaTree ); pCell->SetNext( 0 ); pEOFormulaTree = pCell; @@ -243,13 +243,13 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) { ScFormulaCell* pNext = pCell->GetNext(); if ( pPrev ) - pPrev->SetNext( pNext ); // gibt Vorlaeufer + pPrev->SetNext( pNext ); // gibt Vorlaeufer else - pFormulaTree = pNext; // ist erste Zelle + pFormulaTree = pNext; // ist erste Zelle if ( pNext ) - pNext->SetPrevious( pPrev ); // gibt Nachfolger + pNext->SetPrevious( pPrev ); // gibt Nachfolger else - pEOFormulaTree = pPrev; // ist letzte Zelle + pEOFormulaTree = pPrev; // ist letzte Zelle pCell->SetPrevious( 0 ); pCell->SetNext( 0 ); USHORT nRPN = pCell->GetCode()->GetCodeLen(); @@ -298,7 +298,7 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress ) while ( pCell ) { if ( pCell->GetDirty() ) - pCell = pCell->GetNext(); // alles klar + pCell = pCell->GetNext(); // alles klar else { if ( pCell->GetCode()->IsRecalcModeAlways() ) @@ -311,7 +311,7 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress ) pCell = pNext; } else - { // andere simpel berechnen + { // andere simpel berechnen pCell->SetDirtyVar(); pCell = pCell->GetNext(); } @@ -404,7 +404,7 @@ void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) if ( pEOFormulaTrack ) pEOFormulaTrack->SetNextTrack( pCell ); else - pFormulaTrack = pCell; // kein Ende, kein Anfang.. + pFormulaTrack = pCell; // kein Ende, kein Anfang.. pCell->SetPreviousTrack( pEOFormulaTrack ); pCell->SetNextTrack( 0 ); pEOFormulaTrack = pCell; @@ -421,13 +421,13 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) { ScFormulaCell* pNext = pCell->GetNextTrack(); if ( pPrev ) - pPrev->SetNextTrack( pNext ); // gibt Vorlaeufer + pPrev->SetNextTrack( pNext ); // gibt Vorlaeufer else - pFormulaTrack = pNext; // ist erste Zelle + pFormulaTrack = pNext; // ist erste Zelle if ( pNext ) - pNext->SetPreviousTrack( pPrev ); // gibt Nachfolger + pNext->SetPreviousTrack( pPrev ); // gibt Nachfolger else - pEOFormulaTrack = pPrev; // ist letzte Zelle + pEOFormulaTrack = pPrev; // ist letzte Zelle pCell->SetPreviousTrack( 0 ); pCell->SetNextTrack( 0 ); --nFormulaTrackCount; @@ -465,7 +465,7 @@ void ScDocument::TrackFormulas( ULONG nHintId ) if ( ( pBC = pTrack->GetBroadcaster() ) != NULL ) pBC->Broadcast( aHint ); pBASM->AreaBroadcast( aHint ); - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList ) pCondFormList->SourceChanged( pTrack->aPos ); // for "calculate" event, keep track of which sheets are affected by tracked formulas diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index e3c9d251fab7..bc2bf8c348e5 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -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 @@ -85,7 +85,7 @@ #include "chartlis.hxx" #include "chartlock.hxx" #include "refupdat.hxx" -#include "validat.hxx" // fuer HasMacroCalls +#include "validat.hxx" // fuer HasMacroCalls #include "markdata.hxx" #include "scmod.hxx" #include "printopt.hxx" @@ -95,11 +95,11 @@ #include "charthelper.hxx" #include "dpobject.hxx" -#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() +#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() -// states for online spelling in the visible range (0 is set initially) -#define VSPL_START 0 -#define VSPL_DONE 1 +// states for online spelling in the visible range (0 is set initially) +#define VSPL_START 0 +#define VSPL_DONE 1 // STATIC DATA ----------------------------------------------------------- @@ -159,9 +159,9 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { if ( pNewPrinter == pPrinter ) { - // #i6706# SetPrinter is called with the same printer again if - // the JobSetup has changed. In that case just call UpdateDrawPrinter - // (SetRefDevice for drawing layer) because of changed text sizes. + // #i6706# SetPrinter is called with the same printer again if + // the JobSetup has changed. In that case just call UpdateDrawPrinter + // (SetRefDevice for drawing layer) because of changed text sizes. UpdateDrawPrinter(); } else @@ -205,8 +205,8 @@ VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { if (!pVirtualDevice_100th_mm) { -// pVirtualDevice_100th_mm = new VirtualDevice; -// pVirtualDevice_100th_mm->SetMapMode( MAP_100TH_MM ); +// pVirtualDevice_100th_mm = new VirtualDevice; +// pVirtualDevice_100th_mm->SetMapMode( MAP_100TH_MM ); pVirtualDevice_100th_mm = new VirtualDevice( 1 ); pVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::REFDEV_MODE_MSO1); @@ -239,10 +239,10 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, { case SFX_STYLE_FAMILY_PAGE: { - const USHORT nOldScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); + const USHORT nOldScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); const USHORT nOldScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES); rSet.Put( rChanges ); - const USHORT nNewScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); + const USHORT nNewScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); const USHORT nNewScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES); if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) ) @@ -284,9 +284,9 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, } // Bedeutung der Items in rChanges: - // Item gesetzt - Aenderung uebernehmen - // Dontcare - Default setzen - // Default - keine Aenderung + // Item gesetzt - Aenderung uebernehmen + // Dontcare - Default setzen + // Default - keine Aenderung // ("keine Aenderung" geht nicht mit PutExtended, darum Schleife) for (USHORT nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++) { @@ -334,7 +334,7 @@ void ScDocument::InvalidateTextWidth( const String& rStyleName ) void ScDocument::InvalidateTextWidth( SCTAB nTab ) { - ScAddress aAdrFrom( 0, 0, nTab ); + ScAddress aAdrFrom( 0, 0, nTab ); ScAddress aAdrTo ( MAXCOL, MAXROW, nTab ); InvalidateTextWidth( &aAdrFrom, &aAdrTo, FALSE ); } @@ -343,7 +343,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) BOOL ScDocument::IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab ) { - BOOL bInUse = FALSE; + BOOL bInUse = FALSE; const SCTAB nCount = GetTableCount(); SCTAB i; @@ -438,10 +438,10 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress //------------------------------------------------------------------------ -#define CALCMAX 1000 // Berechnungen -#define ABORT_EVENTS (INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER) +#define CALCMAX 1000 // Berechnungen +#define ABORT_EVENTS (INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER) -BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder versuchen +BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder versuchen { // #i75610# if a printer hasn't been set or created yet, don't create one for this if ( bIdleDisabled || IsInLinkUpdate() || GetPrinter(FALSE) == NULL ) @@ -451,22 +451,22 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers // ULONG nMs = 0; // USHORT nIter = 0; - const ULONG nStart = Time::GetSystemTicks(); - double nPPTX = 0.0; - double nPPTY = 0.0; - OutputDevice* pDev = NULL; - MapMode aOldMap; - ScStyleSheet* pStyle = NULL; - ScColumnIterator* pColIter = NULL; - ScTable* pTable = NULL; - ScColumn* pColumn = NULL; - ScBaseCell* pCell = NULL; - SCTAB nTab = aCurTextWidthCalcPos.Tab(); - SCROW nRow = aCurTextWidthCalcPos.Row(); - SCsCOL nCol = aCurTextWidthCalcPos.Col(); - USHORT nRestart = 0; - USHORT nZoom = 0; - BOOL bNeedMore= FALSE; + const ULONG nStart = Time::GetSystemTicks(); + double nPPTX = 0.0; + double nPPTY = 0.0; + OutputDevice* pDev = NULL; + MapMode aOldMap; + ScStyleSheet* pStyle = NULL; + ScColumnIterator* pColIter = NULL; + ScTable* pTable = NULL; + ScColumn* pColumn = NULL; + ScBaseCell* pCell = NULL; + SCTAB nTab = aCurTextWidthCalcPos.Tab(); + SCROW nRow = aCurTextWidthCalcPos.Row(); + SCsCOL nCol = aCurTextWidthCalcPos.Col(); + USHORT nRestart = 0; + USHORT nZoom = 0; + BOOL bNeedMore= FALSE; if ( !ValidRow(nRow) ) nRow = 0, nCol--; @@ -475,11 +475,11 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers if ( !ValidTab(nTab) || !pTab[nTab] ) nTab = 0; -// DBG_ERROR( String("Start = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String("Start = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); - // SearchMask/Family muss gemerkt werden, - // damit z.B. der Organizer nicht durcheinanderkommt, wenn zwischendurch eine - // Query-Box aufgemacht wird !!! + // SearchMask/Family muss gemerkt werden, + // damit z.B. der Organizer nicht durcheinanderkommt, wenn zwischendurch eine + // Query-Box aufgemacht wird !!! ScStyleSheetPool* pStylePool = xPoolHelper->GetStylePool(); USHORT nOldMask = pStylePool->GetSearchMask(); @@ -497,7 +497,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers { USHORT nCount = 0; - nZoom = GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALE); + nZoom = GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALE); Fraction aZoomFract( nZoom, 100 ); pColumn = &pTable->aCol[nCol]; pColIter = new ScColumnIterator( pColumn, nRow, MAXROW ); @@ -506,13 +506,13 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers { if ( pColIter->Next( nRow, pCell ) ) { - if ( TEXTWIDTH_DIRTY == pCell->GetTextWidth() ) + if ( TEXTWIDTH_DIRTY == pCell->GetTextWidth() ) { if ( !pDev ) { pDev = GetPrinter(); aOldMap = pDev->GetMapMode(); - pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize Point aPix1000 = pDev->LogicToPixel( Point(1000,1000), MAP_TWIP ); nPPTX = aPix1000.X() / 1000.0; @@ -525,15 +525,15 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers bProgress = TRUE; } -// DBG_ERROR( String("t,c,r = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); -// DBG_ERROR( String("nOldWidth = ") + String(pCell->GetTextWidth()) ); +// DBG_ERROR( String("t,c,r = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String("nOldWidth = ") + String(pCell->GetTextWidth()) ); USHORT nNewWidth = (USHORT)GetNeededSize( nCol, nRow, nTab, pDev, nPPTX, nPPTY, aZoomFract,aZoomFract, TRUE, - TRUE ); // bTotalSize + TRUE ); // bTotalSize -// DBG_ERROR( String("nNewWidth = ") + String(nNewWidth) ); +// DBG_ERROR( String("nNewWidth = ") + String(nNewWidth) ); pCell->SetTextWidth( nNewWidth ); @@ -618,7 +618,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers delete pColIter; -// DBG_ERROR( String(nCount) + String(" End = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String(nCount) + String(" End = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); if (pDev) pDev->SetMapMode(aOldMap); @@ -640,7 +640,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers class ScSpellStatus { public: - BOOL bModified; + BOOL bModified; ScSpellStatus() : bModified(FALSE) {}; @@ -656,38 +656,38 @@ IMPL_LINK( ScSpellStatus, EventHdl, EditStatus *, pStatus ) return 0; } -// SPELL_MAXCELLS muss mindestens 256 sein, solange am Iterator keine -// Start-Spalte gesetzt werden kann +// SPELL_MAXCELLS muss mindestens 256 sein, solange am Iterator keine +// Start-Spalte gesetzt werden kann -//! SPELL_MAXTEST fuer Timer und Idle unterschiedlich ??? +//! SPELL_MAXTEST fuer Timer und Idle unterschiedlich ??? -// SPELL_MAXTEST now divided between visible and rest of document +// SPELL_MAXTEST now divided between visible and rest of document -#define SPELL_MAXTEST_VIS 1 -#define SPELL_MAXTEST_ALL 3 -#define SPELL_MAXCELLS 256 +#define SPELL_MAXTEST_VIS 1 +#define SPELL_MAXTEST_ALL 3 +#define SPELL_MAXCELLS 256 BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, USHORT nMaxTest ) { - ScEditEngineDefaulter* pEngine = NULL; //! am Dokument speichern + ScEditEngineDefaulter* pEngine = NULL; //! am Dokument speichern SfxItemSet* pDefaults = NULL; ScSpellStatus aStatus; - USHORT nCellCount = 0; // Zellen insgesamt - USHORT nTestCount = 0; // Aufrufe Spelling - BOOL bChanged = FALSE; // Aenderungen? + USHORT nCellCount = 0; // Zellen insgesamt + USHORT nTestCount = 0; // Aufrufe Spelling + BOOL bChanged = FALSE; // Aenderungen? - SCCOL nCol = rSpellRange.aStart.Col(); // iterator always starts on the left edge + SCCOL nCol = rSpellRange.aStart.Col(); // iterator always starts on the left edge SCROW nRow = rSpellPos.Row(); SCTAB nTab = rSpellPos.Tab(); - if ( !pTab[nTab] ) // sheet deleted? + if ( !pTab[nTab] ) // sheet deleted? { nTab = rSpellRange.aStart.Tab(); nRow = rSpellRange.aStart.Row(); if ( !pTab[nTab] ) { - // may happen for visible range + // may happen for visible range return FALSE; } } @@ -695,7 +695,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe rSpellRange.aStart.Col(), nRow, rSpellRange.aEnd.Col(), rSpellRange.aEnd.Row() ); ScBaseCell* pCell = aIter.GetNext( nCol, nRow ); - // skip everything left of rSpellPos: + // skip everything left of rSpellPos: while ( pCell && nRow == rSpellPos.Row() && nCol < rSpellPos.Col() ) pCell = aIter.GetNext( nCol, nRow ); @@ -710,13 +710,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe { if (!pEngine) { - // #71154# ScTabEditEngine is needed - // because MapMode must be set for some old documents + // #71154# ScTabEditEngine is needed + // because MapMode must be set for some old documents pEngine = new ScTabEditEngine( this ); pEngine->SetControlWord( pEngine->GetControlWord() | ( EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS ) ); pEngine->SetStatusEventHdl( LINK( &aStatus, ScSpellStatus, EventHdl ) ); - // Delimiters hier wie in inputhdl.cxx !!! + // Delimiters hier wie in inputhdl.cxx !!! pEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEngine->GetWordDelimiters() ) ); pDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() ); @@ -728,7 +728,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab ); pPattern->FillEditItemSet( pDefaults ); - pEngine->SetDefaults( pDefaults, FALSE ); //! noetig ? + pEngine->SetDefaults( pDefaults, FALSE ); //! noetig ? USHORT nCellLang = ((const SvxLanguageItem&) pPattern->GetItem(ATTR_FONT_LANGUAGE)).GetValue(); @@ -747,9 +747,9 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe aStatus.bModified = FALSE; pEngine->CompleteOnlineSpelling(); - if ( aStatus.bModified ) // Fehler dazu oder weggekommen? + if ( aStatus.bModified ) // Fehler dazu oder weggekommen? { - BOOL bNeedEdit = TRUE; // Test auf einfachen Text + BOOL bNeedEdit = TRUE; // Test auf einfachen Text if ( !pEngine->HasOnlineSpellErrors() ) { ScEditAttrTester aTester( pEngine ); @@ -767,14 +767,14 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe this, pEngine->GetEditTextObjectPool() ) ); delete pNewData; } - else // einfacher String + else // einfacher String PutCell( nCol, nRow, nTab, new ScStringCell( pEngine->GetText() ) ); - // Paint + // Paint if (pShell) { - // #47751# Seitenvorschau ist davon nicht betroffen - // (sollte jedenfalls nicht) + // #47751# Seitenvorschau ist davon nicht betroffen + // (sollte jedenfalls nicht) ScPaintHint aHint( ScRange( nCol, nRow, nTab ), PAINT_GRID ); aHint.SetPrintFlag( FALSE ); pShell->Broadcast( aHint ); @@ -783,17 +783,17 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe bChanged = TRUE; } - if ( ++nTestCount >= nMaxTest ) // checked enough text? + if ( ++nTestCount >= nMaxTest ) // checked enough text? break; } - if ( ++nCellCount >= SPELL_MAXCELLS ) // seen enough cells? + if ( ++nCellCount >= SPELL_MAXCELLS ) // seen enough cells? break; } if ( pCell ) { - ++nCol; // continue after last cell + ++nCol; // continue after last cell if ( nCol > rSpellRange.aEnd.Col() ) { nCol = rSpellRange.aStart.Col(); @@ -803,7 +803,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe } } - if (!pCell) // end of range reached -> next sheet + if (!pCell) // end of range reached -> next sheet { ++nTab; if ( nTab > rSpellRange.aEnd.Tab() || !pTab[nTab] ) @@ -811,12 +811,12 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe nCol = rSpellRange.aStart.Col(); nRow = rSpellRange.aStart.Row(); - nVisSpellState = VSPL_DONE; //! only if this is for the visible range + nVisSpellState = VSPL_DONE; //! only if this is for the visible range } rSpellPos.Set( nCol, nRow, nTab ); delete pDefaults; - delete pEngine; // bevor aStatus out of scope geht + delete pEngine; // bevor aStatus out of scope geht return bChanged; } @@ -832,23 +832,23 @@ BOOL ScDocument::ContinueOnlineSpelling() BOOL bOldInserting = IsInsertingFromOtherDoc(); SetInsertingFromOtherDoc( TRUE ); - //! use one EditEngine for both calls + //! use one EditEngine for both calls - // #41504# first check visible range + // #41504# first check visible range BOOL bResult = OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_VIS ); - // during first pass through visible range, always continue + // during first pass through visible range, always continue if ( nVisSpellState == VSPL_START ) bResult = TRUE; if (bResult) { - // if errors found, continue there + // if errors found, continue there OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_ALL ); } else { - // if nothing found there, continue with rest of document + // if nothing found there, continue with rest of document ScRange aTotalRange( 0,0,0, MAXCOL,MAXROW,MAXTAB ); bResult = OnlineSpellInRange( aTotalRange, aOnlineSpellPos, SPELL_MAXTEST_ALL ); } @@ -863,7 +863,7 @@ void ScDocument::SetOnlineSpellPos( const ScAddress& rPos ) { aOnlineSpellPos = rPos; - // skip visible area for aOnlineSpellPos + // skip visible area for aOnlineSpellPos if ( aVisSpellRange.In( aOnlineSpellPos ) ) aOnlineSpellPos = aVisSpellRange.aEnd; } @@ -873,7 +873,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) BOOL bChange = ( aVisSpellRange != rNewRange ); if (bChange) { - // continue spelling through visible range when scrolling down + // continue spelling through visible range when scrolling down BOOL bContDown = ( nVisSpellState == VSPL_START && rNewRange.In( aVisSpellPos ) && rNewRange.aStart.Row() > aVisSpellRange.aStart.Row() && rNewRange.aStart.Col() == aVisSpellRange.aStart.Col() && @@ -887,7 +887,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) nVisSpellState = VSPL_START; } - // skip visible area for aOnlineSpellPos + // skip visible area for aOnlineSpellPos if ( aVisSpellRange.In( aOnlineSpellPos ) ) aOnlineSpellPos = aVisSpellRange.aEnd; } @@ -896,7 +896,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) void ScDocument::RemoveAutoSpellObj() { - // alle Spelling-Informationen entfernen + // alle Spelling-Informationen entfernen for (SCTAB nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++) pTab[nTab]->RemoveAutoSpellObj(); @@ -904,7 +904,7 @@ void ScDocument::RemoveAutoSpellObj() //------------------------------------------------------------------------ -BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuchen +BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuchen { BOOL bAnyLeft = FALSE; @@ -933,13 +933,13 @@ BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuche void ScDocument::SaveDdeLinks(SvStream& rStream) const { - // bei 4.0-Export alle mit Modus != DEFAULT weglassen + // bei 4.0-Export alle mit Modus != DEFAULT weglassen BOOL bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 ); const ::sfx2::SvBaseLinks& rLinks = GetLinkManager()->GetLinks(); USHORT nCount = rLinks.Count(); - // erstmal zaehlen... + // erstmal zaehlen... USHORT nDdeCount = 0; USHORT i; @@ -951,12 +951,12 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const ++nDdeCount; } - // Header + // Header ScMultipleWriteHeader aHdr( rStream ); rStream << nDdeCount; - // Links speichern + // Links speichern for (i=0; iGetLinks(); USHORT nCount = rLinks.Count(); @@ -1001,7 +1001,7 @@ BOOL ScDocument::HasDdeLinks() const void ScDocument::SetInLinkUpdate(BOOL bSet) { - // called from TableLink and AreaLink + // called from TableLink and AreaLink DBG_ASSERT( bInLinkUpdate != bSet, "SetInLinkUpdate twice" ); bInLinkUpdate = bSet; @@ -1094,9 +1094,9 @@ void ScDocument::UpdateDdeLinks() BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ) { - // fuer refresh() per StarOne Api - // ResetValue() fuer einzelnen Link nicht noetig - //! wenn's mal alles asynchron wird, aber auch hier + // fuer refresh() per StarOne Api + // ResetValue() fuer einzelnen Link nicht noetig + //! wenn's mal alles asynchron wird, aber auch hier BOOL bFound = FALSE; if (GetLinkManager()) @@ -1132,14 +1132,14 @@ void ScDocument::DisconnectDdeLinks() { ::sfx2::SvBaseLink* pBase = *rLinks[i]; if (pBase->ISA(ScDdeLink)) - pBase->Disconnect(); // bleibt im LinkManager eingetragen + pBase->Disconnect(); // bleibt im LinkManager eingetragen } } } void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const { - if (bIsClip) // aus Stream erzeugen + if (bIsClip) // aus Stream erzeugen { if (pClipData) { @@ -1315,7 +1315,7 @@ bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults ) BOOL ScDocument::HasAreaLinks() const { - if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager + if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count(); @@ -1442,12 +1442,12 @@ void ScDocument::KeyInput( const KeyEvent& ) apTemporaryChartLock->StartOrContinueLocking(); } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- BOOL ScDocument::CheckMacroWarn() { - // The check for macro configuration, macro warning and disabling is now handled - // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic. + // The check for macro configuration, macro warning and disabling is now handled + // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic. return TRUE; } @@ -1456,17 +1456,17 @@ BOOL ScDocument::CheckMacroWarn() SfxBindings* ScDocument::GetViewBindings() { - // used to invalidate slots after changes to this document + // used to invalidate slots after changes to this document if ( !pShell ) - return NULL; // no ObjShell -> no view + return NULL; // no ObjShell -> no view - // first check current view + // first check current view SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if ( pViewFrame && pViewFrame->GetObjectShell() != pShell ) // wrong document? + if ( pViewFrame && pViewFrame->GetObjectShell() != pShell ) // wrong document? pViewFrame = NULL; - // otherwise use first view for this doc + // otherwise use first view for this doc if ( !pViewFrame ) pViewFrame = SfxViewFrame::GetFirst( pShell ); @@ -1482,7 +1482,7 @@ void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine, utl::TransliterationWrapper& rTranslitarationWrapper, BOOL bConsiderLanguage, ScDocument* pDoc ) { - //! should use TransliterateText method of EditEngine instead, when available! + //! should use TransliterateText method of EditEngine instead, when available! sal_uInt16 nLanguage = LANGUAGE_SYSTEM; @@ -1502,7 +1502,7 @@ void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine, String aOldStr = rEngine.GetText( aSel ); SfxItemSet aAttr = rEngine.GetAttribs( aSel ); - if ( aAttr.GetItemState( EE_FEATURE_FIELD ) != SFX_ITEM_ON ) // fields are not touched + if ( aAttr.GetItemState( EE_FEATURE_FIELD ) != SFX_ITEM_ON ) // fields are not touched { if ( bConsiderLanguage ) { @@ -1537,7 +1537,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode(); sal_uInt16 nLanguage = LANGUAGE_SYSTEM; - ScEditEngineDefaulter* pEngine = NULL; // not using pEditEngine member because of defaults + ScEditEngineDefaulter* pEngine = NULL; // not using pEditEngine member because of defaults SCTAB nCount = GetTableCount(); for (SCTAB nTab = 0; nTab < nCount; nTab++) @@ -1563,7 +1563,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp if ( bConsiderLanguage ) { - BYTE nScript = GetStringScriptType( aOldStr ); //! cell script type? + BYTE nScript = GetStringScriptType( aOldStr ); //! cell script type? USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index abef7d53c2af..92b5fb7d0bc8 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -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 @@ -61,7 +61,7 @@ #include "rechead.hxx" #include "poolhelp.hxx" #include "docpool.hxx" -#include "detfunc.hxx" // for UpdateAllComments +#include "detfunc.hxx" // for UpdateAllComments #include "editutil.hxx" #include "postit.hxx" #include "charthelper.hxx" @@ -128,8 +128,8 @@ void ScDocument::TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDes } } - // #71726# make sure the data references of charts are adapted - // (this must be after InsertObject!) + // #71726# make sure the data references of charts are adapted + // (this must be after InsertObject!) ScChartHelper::AdjustRangesOfChartsOnDestinationPage( pSrcDoc, this, nSrcPos, nDestPos ); } @@ -138,30 +138,30 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if (pDocShell && !pShell) pShell = pDocShell; -// DBG_ASSERT(pShell,"InitDrawLayer ohne Shell"); +// DBG_ASSERT(pShell,"InitDrawLayer ohne Shell"); if (!pDrawLayer) { String aName; - if ( pShell && !pShell->IsLoading() ) // #88438# don't call GetTitle while loading + if ( pShell && !pShell->IsLoading() ) // #88438# don't call GetTitle while loading aName = pShell->GetTitle(); pDrawLayer = new ScDrawLayer( this, aName ); if (GetLinkManager()) pDrawLayer->SetLinkManager( pLinkManager ); - // Drawing pages are accessed by table number, so they must also be present - // for preceding table numbers, even if the tables aren't allocated - // (important for clipboard documents). + // Drawing pages are accessed by table number, so they must also be present + // for preceding table numbers, even if the tables aren't allocated + // (important for clipboard documents). SCTAB nDrawPages = 0; SCTAB nTab; for (nTab=0; nTab<=MAXTAB; nTab++) if (pTab[nTab]) - nDrawPages = nTab + 1; // needed number of pages + nDrawPages = nTab + 1; // needed number of pages for (nTab=0; nTabScAddPage( nTab ); // always add page, with or without the table + pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table if (pTab[nTab]) { String aTabName; @@ -170,7 +170,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) pTab[nTab]->SetDrawPageSize(false,false); // #54782# set the right size immediately #if 0 - ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH * HMM_PER_TWIPS ); + ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH * HMM_PER_TWIPS ); ULONG ny = (ULONG) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS ); pDrawLayer->SetPageSize( nTab, Size( nx, ny ) ); #endif @@ -220,8 +220,8 @@ void ScDocument::UpdateDrawPrinter() // use the printer even if IsValid is false // Application::GetDefaultDevice causes trouble with changing MapModes -// OutputDevice* pRefDev = GetPrinter(); -// pRefDev->SetMapMode( MAP_100TH_MM ); +// OutputDevice* pRefDev = GetPrinter(); +// pRefDev->SetMapMode( MAP_100TH_MM ); pDrawLayer->SetRefDevice(GetRefDevice()); } } @@ -292,7 +292,7 @@ void ScDocument::DeleteObjectsInSelection( const ScMarkData& rMark ) BOOL ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark ) { - // pTabMark is used only for selected tables. If pTabMark is 0, all tables of rRange are used. + // pTabMark is used only for selected tables. If pTabMark is 0, all tables of rRange are used. if (!pDrawLayer) return FALSE; @@ -414,10 +414,10 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) { - // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect - // betroffen sind? - // (fuer Drawing-Optimierung, vor dem Hintergrund braucht dann nicht geloescht - // zu werden) + // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect + // betroffen sind? + // (fuer Drawing-Optimierung, vor dem Hintergrund braucht dann nicht geloescht + // zu werden) if (!pDrawLayer) return FALSE; @@ -442,9 +442,9 @@ BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) BOOL ScDocument::HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ) { - // Gibt es ueberhaupt Objekte, die (teilweise) von rMMRect - // betroffen sind? - // (um leere Seiten beim Drucken zu erkennen) + // Gibt es ueberhaupt Objekte, die (teilweise) von rMMRect + // betroffen sind? + // (um leere Seiten beim Drucken zu erkennen) if (!pDrawLayer) return FALSE; @@ -475,7 +475,7 @@ void ScDocument::EnsureGraphicNames() SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) { - // fuer Drag&Drop auf Zeichenobjekt + // fuer Drag&Drop auf Zeichenobjekt SdrObject* pFound = NULL; if (pDrawLayer && pTab[nTab]) @@ -490,8 +490,8 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) { if ( pObject->GetCurrentBoundRect().IsInside(rPos) ) { - // Intern interessiert gar nicht - // Objekt vom Back-Layer nur, wenn kein Objekt von anderem Layer getroffen + // Intern interessiert gar nicht + // Objekt vom Back-Layer nur, wenn kein Objekt von anderem Layer getroffen SdrLayerID nLayer = pObject->GetLayer(); if ( (nLayer != SC_LAYER_INTERN) && (nLayer != SC_LAYER_HIDDEN) ) @@ -503,7 +503,7 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) } } } - // weitersuchen -> letztes (oberstes) getroffenes Objekt nehmen + // weitersuchen -> letztes (oberstes) getroffenes Objekt nehmen pObject = aIter.Next(); } @@ -519,13 +519,13 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow )) return FALSE; - ScDocument* pThis = (ScDocument*)this; //! GetMMRect / HasAnyDraw etc. const !!! + ScDocument* pThis = (ScDocument*)this; //! GetMMRect / HasAnyDraw etc. const !!! Rectangle aMMRect; if ( pLastRange && pLastMM && nTab == pLastRange->aStart.Tab() && nStartRow == pLastRange->aStart.Row() && nEndRow == pLastRange->aEnd.Row() ) { - // keep vertical part of aMMRect, only update horizontal position + // keep vertical part of aMMRect, only update horizontal position aMMRect = *pLastMM; long nLeft = 0; @@ -553,17 +553,17 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, if ( nStartCol > 0 && !bLeftIsEmpty ) { - // aehnlich wie in ScPrintFunc::AdjustPrintArea - //! ExtendPrintArea erst ab Start-Spalte des Druckbereichs + // aehnlich wie in ScPrintFunc::AdjustPrintArea + //! ExtendPrintArea erst ab Start-Spalte des Druckbereichs SCCOL nExtendCol = nStartCol - 1; SCROW nTmpRow = nEndRow; pThis->ExtendMerge( 0,nStartRow, nExtendCol,nTmpRow, nTab, - FALSE, TRUE ); // kein Refresh, incl. Attrs + FALSE, TRUE ); // kein Refresh, incl. Attrs OutputDevice* pDev = pThis->GetPrinter(); - pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize pThis->ExtendPrintArea( pDev, nTab, 0, nStartRow, nExtendCol, nEndRow ); if ( nExtendCol >= nStartCol ) return FALSE; @@ -637,9 +637,9 @@ void ScDocument::InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& Rectangle aObjRect = pObject->GetLogicRect(); if ( aObjRect.IsOver( rMMRect ) ) { - // Uno-Controls zeichnen sich immer komplett, ohne Ruecksicht - // auf ClippingRegions. Darum muss das ganze Objekt neu gepainted - // werden, damit die Selektion auf der Tabelle nicht uebermalt wird. + // Uno-Controls zeichnen sich immer komplett, ohne Ruecksicht + // auf ClippingRegions. Darum muss das ganze Objekt neu gepainted + // werden, damit die Selektion auf der Tabelle nicht uebermalt wird. //pWin->Invalidate( aObjRect.GetIntersection( rMMRect ) ); pWin->Invalidate( aObjRect ); @@ -654,8 +654,8 @@ void ScDocument::InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const { - // looks for detective objects, annotations don't count - // (used to adjust scale so detective objects hit their cells better) + // looks for detective objects, annotations don't count + // (used to adjust scale so detective objects hit their cells better) BOOL bFound = FALSE; @@ -683,11 +683,11 @@ BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const void ScDocument::UpdateFontCharSet() { - // In alten Versionen (bis incl. 4.0 ohne SP) wurden beim Austausch zwischen - // Systemen die CharSets in den Font-Attributen nicht angepasst. - // Das muss fuer Dokumente bis incl SP2 nun nachgeholt werden: - // Alles, was nicht SYMBOL ist, wird auf den System-CharSet umgesetzt. - // Bei neuen Dokumenten (Version SC_FONTCHARSET) sollte der CharSet stimmen. + // In alten Versionen (bis incl. 4.0 ohne SP) wurden beim Austausch zwischen + // Systemen die CharSets in den Font-Attributen nicht angepasst. + // Das muss fuer Dokumente bis incl SP2 nun nachgeholt werden: + // Alles, was nicht SYMBOL ist, wird auf den System-CharSet umgesetzt. + // Bei neuen Dokumenten (Version SC_FONTCHARSET) sollte der CharSet stimmen. BOOL bUpdateOld = ( nSrcVer < SC_FONTCHARSET ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 1efe32446eef..b7ecc946225c 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -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 @@ -83,7 +83,7 @@ #include "detdata.hxx" #include "cell.hxx" #include "dpobject.hxx" -#include "detfunc.hxx" // for UpdateAllComments +#include "detfunc.hxx" // for UpdateAllComments #include "scmod.hxx" #include "dociter.hxx" #include "progress.hxx" @@ -104,9 +104,9 @@ using ::std::set; struct ScDefaultAttr { - const ScPatternAttr* pAttr; - SCROW nFirst; - SCSIZE nCount; + const ScPatternAttr* pAttr; + SCROW nFirst; + SCSIZE nCount; ScDefaultAttr(const ScPatternAttr* pPatAttr) : pAttr(pPatAttr), nFirst(0), nCount(0) {} }; @@ -118,7 +118,7 @@ struct ScLessDefaultAttr } }; -typedef std::set ScDefaultAttrSet; +typedef std::set ScDefaultAttrSet; void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) { @@ -127,7 +127,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) String aString = ScGlobal::GetRscString(STR_TABLE_DEF); //"Tabelle" aString += String::CreateFromInt32(nTab+1); if ( _bNeedsNameCheck ) - CreateValidTabName( aString ); // keine doppelten + CreateValidTabName( aString ); // keine doppelten pTab[nTab] = new ScTable(this, nTab, aString); pTab[nTab]->SetLoadingMedium(bLoadingMedium); @@ -158,7 +158,7 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const return FALSE; } -BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) +BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) { if (VALIDTAB(nTab)) { @@ -265,15 +265,15 @@ void ScDocument::CreateValidTabName(String& rName) const // neu erzeugen const String aStrTable( ScResId(SCSTR_TABLE) ); - BOOL bOk = FALSE; + BOOL bOk = FALSE; - // vorneweg testen, ob der Prefix als gueltig erkannt wird - // wenn nicht, nur doppelte vermeiden + // vorneweg testen, ob der Prefix als gueltig erkannt wird + // wenn nicht, nur doppelte vermeiden BOOL bPrefix = ValidTabName( aStrTable ); DBG_ASSERT(bPrefix, "ungueltiger Tabellenname"); SCTAB nDummy; - SCTAB nLoops = 0; // "zur Sicherheit" + SCTAB nLoops = 0; // "zur Sicherheit" for ( SCTAB i = nMaxTableNumber+1; !bOk && nLoops <= MAXTAB; i++ ) { rName = aStrTable; @@ -314,9 +314,9 @@ void ScDocument::CreateValidTabName(String& rName) const BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, BOOL bExternalDocument ) { - SCTAB nTabCount = GetTableCount(); - BOOL bValid = ValidTab(nTabCount); - if ( !bExternalDocument ) // sonst rName == "'Doc'!Tab", vorher pruefen + SCTAB nTabCount = GetTableCount(); + BOOL bValid = ValidTab(nTabCount); + if ( !bExternalDocument ) // sonst rName == "'Doc'!Tab", vorher pruefen bValid = (bValid && ValidNewTabName(rName)); if (bValid) { @@ -372,7 +372,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, if (pTab[i]) pTab[i]->StartAllListeners(); - // update conditional formats after table is inserted + // update conditional formats after table is inserted if ( pCondFormList ) pCondFormList->UpdateReference( URM_INSDEL, aRange, 0,0,1 ); if ( pValidationList ) @@ -403,7 +403,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc ) if (nTabCount > 1) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab ); DelBroadcastAreasInRange( aRange ); @@ -481,13 +481,13 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc ) BOOL ScDocument::RenameTab( SCTAB nTab, const String& rName, BOOL /* bUpdateRef */, BOOL bExternalDocument ) { - BOOL bValid = FALSE; - SCTAB i; + BOOL bValid = FALSE; + SCTAB i; if VALIDTAB(nTab) if (pTab[nTab]) { if ( bExternalDocument ) - bValid = TRUE; // zusammengesetzter Name + bValid = TRUE; // zusammengesetzter Name else bValid = ValidTabName(rName); for (i=0; (i<=MAXTAB) && bValid; i++) @@ -586,10 +586,10 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL ) return; } - pTab[nTab]->SetLayoutRTL( bRTL ); // only sets the flag + pTab[nTab]->SetLayoutRTL( bRTL ); // only sets the flag pTab[nTab]->SetDrawPageSize(); - // mirror existing objects: + // mirror existing objects: if (pDrawLayer) { @@ -601,8 +601,8 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL ) SdrObject* pObject = aIter.Next(); while (pObject) { - // objects with ScDrawObjData are re-positioned in SetPageSize, - // don't mirror again + // objects with ScDrawObjData are re-positioned in SetPageSize, + // don't mirror again ScDrawObjData* pData = ScDrawLayer::GetObjData( pObject ); if ( !pData ) pDrawLayer->MirrorRTL( pObject ); @@ -628,8 +628,8 @@ BOOL ScDocument::IsLayoutRTL( SCTAB nTab ) const BOOL ScDocument::IsNegativePage( SCTAB nTab ) const { - // Negative page area is always used for RTL layout. - // The separate method is used to find all RTL handling of drawing objects. + // Negative page area is always used for RTL layout. + // The separate method is used to find all RTL handling of drawing objects. return IsLayoutRTL( nTab ); } @@ -637,7 +637,7 @@ BOOL ScDocument::IsNegativePage( SCTAB nTab ) const /* ---------------------------------------------------------------------------- benutzten Bereich suchen: - GetCellArea - nur Daten + GetCellArea - nur Daten GetTableArea - Daten / Attribute GetPrintArea - beruecksichtigt auch Zeichenobjekte, streicht Attribute bis ganz rechts / unten @@ -706,7 +706,7 @@ bool ScDocument::ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol, return pTab[nTab]->ShrinkToUsedDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bColumnsOnly); } -// zusammenhaengender Bereich +// zusammenhaengender Bereich void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const @@ -837,7 +837,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, BOOL bTest = TRUE; BOOL bRet = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for ( i = nStartTab; i <= nEndTab && bTest; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) bTest &= pTab[i]->TestInsertRow( nStartCol, nEndCol, nSize ); @@ -871,8 +871,8 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) pTab[i]->InsertRow( nStartCol, nEndCol, nStartRow, nSize ); - // #82991# UpdateRef for drawing layer must be after inserting, - // when the new row heights are known. + // #82991# UpdateRef for drawing layer must be after inserting, + // when the new row heights are known. for (i=nStartTab; i<=nEndTab; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) pTab[i]->UpdateDrawRef( URM_INSDEL, @@ -880,7 +880,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, 0, static_cast(nSize), 0 ); if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() ) - { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist + { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist // ein neues Listening faellig, bisherige Listener wurden in // FormulaCell UpdateReference abgehaengt StartAllListeners(); @@ -931,7 +931,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, } BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden // handle chunks of consecutive selected sheets together SCTAB nTabRangeStart = nStartTab; @@ -1040,7 +1040,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, BOOL bTest = TRUE; BOOL bRet = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for ( i = nStartTab; i <= nEndTab && bTest; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) bTest &= pTab[i]->TestInsertCol( nStartRow, nEndRow, nSize ); @@ -1072,7 +1072,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, pTab[i]->InsertCol( nStartCol, nStartRow, nEndRow, nSize ); if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() ) - { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist + { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist // ein neues Listening faellig, bisherige Listener wurden in // FormulaCell UpdateReference abgehaengt StartAllListeners(); @@ -1121,7 +1121,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA } BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden // handle chunks of consecutive selected sheets together SCTAB nTabRangeStart = nStartTab; @@ -1190,8 +1190,8 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL } -// fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert -// (ohne Paint) +// fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert +// (ohne Paint) void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, @@ -1210,32 +1210,32 @@ void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, SCROW nNewEndY = rNew.aEnd.Row(); SCTAB nTab = rOld.aStart.Tab(); - // wenn es mehr Zeilen werden, werden Spalten auf der alten Hoehe eingefuegt/geloescht + // wenn es mehr Zeilen werden, werden Spalten auf der alten Hoehe eingefuegt/geloescht BOOL bGrowY = ( nNewEndY > nOldEndY ); SCROW nColEndY = bGrowY ? nOldEndY : nNewEndY; SCCOL nRowEndX = bGrowY ? nNewEndX : nOldEndX; - // Spalten + // Spalten - if ( nNewEndX > nOldEndX ) // Spalten einfuegen + if ( nNewEndX > nOldEndX ) // Spalten einfuegen { rColRange = ScRange( nOldEndX+1, nStartY, nTab, nNewEndX, nColEndY, nTab ); rInsCol = TRUE; } - else if ( nNewEndX < nOldEndX ) // Spalten loeschen + else if ( nNewEndX < nOldEndX ) // Spalten loeschen { rColRange = ScRange( nNewEndX+1, nStartY, nTab, nOldEndX, nColEndY, nTab ); rDelCol = TRUE; } - // Zeilen + // Zeilen - if ( nNewEndY > nOldEndY ) // Zeilen einfuegen + if ( nNewEndY > nOldEndY ) // Zeilen einfuegen { rRowRange = ScRange( nStartX, nOldEndY+1, nTab, nRowEndX, nNewEndY, nTab ); rInsRow = TRUE; } - else if ( nNewEndY < nOldEndY ) // Zeilen loeschen + else if ( nNewEndY < nOldEndY ) // Zeilen loeschen { rRowRange = ScRange( nStartX, nNewEndY+1, nTab, nRowEndX, nOldEndY, nTab ); rDelRow = TRUE; @@ -1276,9 +1276,9 @@ BOOL ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew ) ScRange aColRange,aRowRange; lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow ); - if ( bInsCol && !CanInsertCol( aColRange ) ) // Zellen am Rand ? + if ( bInsCol && !CanInsertCol( aColRange ) ) // Zellen am Rand ? bOk = FALSE; - if ( bInsRow && !CanInsertRow( aRowRange ) ) // Zellen am Rand ? + if ( bInsRow && !CanInsertRow( aRowRange ) ) // Zellen am Rand ? bOk = FALSE; if ( bInsCol || bDelCol ) @@ -1308,16 +1308,16 @@ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow ); if ( bInsCol ) - InsertCol( aColRange ); // Spalten zuerst einfuegen + InsertCol( aColRange ); // Spalten zuerst einfuegen if ( bInsRow ) InsertRow( aRowRange ); if ( bDelRow ) - DeleteRow( aRowRange ); // Zeilen zuerst loeschen + DeleteRow( aRowRange ); // Zeilen zuerst loeschen if ( bDelCol ) DeleteCol( aColRange ); - // Referenzen um eingefuegte Zeilen erweitern + // Referenzen um eingefuegte Zeilen erweitern if ( bInsCol || bInsRow ) { @@ -1338,7 +1338,7 @@ void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, PutInOrder( nCol1, nCol2 ); PutInOrder( nRow1, nRow2 ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCTAB i = 0; i <= MAXTAB; i++) if (pTab[i]) if ( rMark.GetTableSelect(i) || bIsUndo ) @@ -1356,7 +1356,7 @@ void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, if ( VALIDTAB(nTab) && pTab[nTab] ) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden pTab[nTab]->DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag); SetAutoCalc( bOldAutoCalc ); } @@ -1473,7 +1473,7 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (VALIDTAB(nTab1) && VALIDTAB(nTab2)) { BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCTAB i = nTab1; i <= nTab2; i++) { if (pTab[i] && pDestDoc->pTab[i]) @@ -1497,7 +1497,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (VALIDTAB(nTab1) && VALIDTAB(nTab2)) { BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden if (nTab1 > 0) CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks ); @@ -1525,7 +1525,7 @@ void ScDocument::CopyToDocument(const ScRange& rRange, if( !pDestDoc->aDocName.Len() ) pDestDoc->aDocName = aDocName; BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCTAB i = aNewRange.aStart.Tab(); i <= aNewRange.aEnd.Tab(); i++) if (pTab[i] && pDestDoc->pTab[i]) pTab[i]->CopyToTable(aNewRange.aStart.Col(), aNewRange.aStart.Row(), @@ -1546,7 +1546,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange, SCTAB nTab2 = aNewRange.aEnd.Tab(); BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDestDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden if (nTab1 > 0) CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks ); @@ -1597,7 +1597,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam, if (pDrawLayer && bIncludeObjects) { - // also copy drawing objects + // also copy drawing objects Rectangle aObjRect = GetMMRect( aClipRange.aStart.Col(), aClipRange.aStart.Row(), aClipRange.aEnd.Col(), aClipRange.aEnd.Row(), i); pDrawLayer->CopyToClip(pClipDoc, i, aObjRect); @@ -1641,15 +1641,15 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL DBG_ASSERT( bIsClip && pTransClip && pTransClip->bIsClip, "TransposeClip mit falschem Dokument" ); - // initialisieren - // -> pTransClip muss vor dem Original-Dokument geloescht werden! + // initialisieren + // -> pTransClip muss vor dem Original-Dokument geloescht werden! - pTransClip->ResetClip(this, (ScMarkData*)NULL); // alle + pTransClip->ResetClip(this, (ScMarkData*)NULL); // alle - // Bereiche uebernehmen + // Bereiche uebernehmen pTransClip->pRangeName->FreeAll(); - for (USHORT i = 0; i < pRangeName->GetCount(); i++) //! DB-Bereiche Pivot-Bereiche auch !!! + for (USHORT i = 0; i < pRangeName->GetCount(); i++) //! DB-Bereiche Pivot-Bereiche auch !!! { USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex(); ScRangeData* pData = new ScRangeData(*((*pRangeName)[i])); @@ -1659,7 +1659,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL pData->SetIndex(nIndex); } - // Daten + // Daten ScRange aClipRange = GetClipParam().getWholeRange(); if ( ValidRow(aClipRange.aEnd.Row()-aClipRange.aStart.Row()) ) @@ -1674,11 +1674,11 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL if ( pDrawLayer && ( nFlags & IDF_OBJECTS ) ) { - // Drawing objects are copied to the new area without transposing. - // CopyFromClip is used to adjust the objects to the transposed block's - // cell range area. - // (pDrawLayer in the original clipboard document is set only if there - // are drawing objects to copy) + // Drawing objects are copied to the new area without transposing. + // CopyFromClip is used to adjust the objects to the transposed block's + // cell range area. + // (pDrawLayer in the original clipboard document is set only if there + // are drawing objects to copy) pTransClip->InitDrawLayer(); Rectangle aSourceRect = GetMMRect( aClipRange.aStart.Col(), aClipRange.aStart.Row(), @@ -1698,7 +1698,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL DBG_ERROR("TransposeClip: zu gross"); } - // Dies passiert erst beim Einfuegen... + // Dies passiert erst beim Einfuegen... GetClipParam().mbCutMode = false; } @@ -1936,16 +1936,16 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, if ( pCBFCP->pClipDoc->pDrawLayer && ( pCBFCP->nInsFlag & IDF_OBJECTS ) ) { - // also copy drawing objects + // also copy drawing objects // drawing layer must be created before calling CopyFromClip // (ScDocShell::MakeDrawLayer also does InitItems etc.) DBG_ASSERT( pDrawLayer, "CopyBlockFromClip: No drawing layer" ); if ( pDrawLayer ) { - // For GetMMRect, the row heights in the target document must already be valid - // (copied in an extra step before pasting, or updated after pasting cells, but - // before pasting objects). + // For GetMMRect, the row heights in the target document must already be valid + // (copied in an extra step before pasting, or updated after pasting cells, but + // before pasting objects). Rectangle aSourceRect = pCBFCP->pClipDoc->GetMMRect( nCol1-nDx, nRow1-nDy, nCol2-nDx, nRow2-nDy, nClipTab ); @@ -2006,10 +2006,10 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, const ScCopyBlockFromClipParams* pCBFCP, SCROW & rClipStartRow ) { - // call CopyBlockFromClip for ranges of consecutive non-filtered rows - // nCol1/nRow1 etc. is in target doc + // call CopyBlockFromClip for ranges of consecutive non-filtered rows + // nCol1/nRow1 etc. is in target doc - // filtered state is taken from first used table in clipboard (as in GetClipArea) + // filtered state is taken from first used table in clipboard (as in GetClipArea) SCTAB nFlagTab = 0; ScTable** ppClipTab = pCBFCP->pClipDoc->pTab; while ( nFlagTab < MAXTAB && !ppClipTab[nFlagTab] ) @@ -2065,7 +2065,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar if (pClipDoc->bIsClip && pClipDoc->GetTableCount()) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple recalculations + SetAutoCalc( FALSE ); // avoid multiple recalculations NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc); @@ -2115,8 +2115,8 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar nDelFlag |= IDF_NOTE; else if ( nInsFlag & IDF_CONTENTS ) nDelFlag |= IDF_CONTENTS; - // With bSkipAttrForEmpty, don't remove attributes, copy - // on top of existing attributes instead. + // With bSkipAttrForEmpty, don't remove attributes, copy + // on top of existing attributes instead. if ( ( nInsFlag & IDF_ATTRIB ) && !bSkipAttrForEmpty ) nDelFlag |= IDF_ATTRIB; @@ -2124,14 +2124,14 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar aCBFCP.pRefUndoDoc = pRefUndoDoc; aCBFCP.pClipDoc = pClipDoc; aCBFCP.nInsFlag = nInsFlag; - aCBFCP.bAsLink = bAsLink; + aCBFCP.bAsLink = bAsLink; aCBFCP.bSkipAttrForEmpty = bSkipAttrForEmpty; - aCBFCP.nTabStart = MAXTAB; // wird in der Schleife angepasst - aCBFCP.nTabEnd = 0; // wird in der Schleife angepasst + aCBFCP.nTabStart = MAXTAB; // wird in der Schleife angepasst + aCBFCP.nTabEnd = 0; // wird in der Schleife angepasst - // Inc/DecRecalcLevel einmal aussen, damit nicht fuer jeden Block - // die Draw-Seitengroesse neu berechnet werden muss - //! nur wenn ganze Zeilen/Spalten kopiert werden? + // Inc/DecRecalcLevel einmal aussen, damit nicht fuer jeden Block + // die Draw-Seitengroesse neu berechnet werden muss + //! nur wenn ganze Zeilen/Spalten kopiert werden? for (SCTAB j = 0; j <= MAXTAB; j++) if (pTab[j] && rMark.GetTableSelect(j)) @@ -2149,7 +2149,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar pDestRanges = &aLocalRangeList; } - bInsertingFromOtherDoc = TRUE; // kein Broadcast/Listener aufbauen bei Insert + bInsertingFromOtherDoc = TRUE; // kein Broadcast/Listener aufbauen bei Insert // bei mindestens 64 Zeilen wird in ScColumn::CopyFromClip voralloziert BOOL bDoDouble = ( nYw < 64 && nAllRow2 - nAllRow1 > 64); @@ -2434,8 +2434,8 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered nClipY = nEndRow - nStartRow; else { - // count non-filtered rows - // count on first used table in clipboard + // count non-filtered rows + // count on first used table in clipboard SCTAB nCountTab = 0; while ( nCountTab < MAXTAB && !pTab[nCountTab] ) ++nCountTab; @@ -2445,7 +2445,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered if ( nResult > 0 ) nClipY = nResult - 1; else - nClipY = 0; // always return at least 1 row + nClipY = 0; // always return at least 1 row } } @@ -2470,7 +2470,7 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) BOOL ScDocument::HasClipFilteredRows() { - // count on first used table in clipboard + // count on first used table in clipboard SCTAB nCountTab = 0; while ( nCountTab < MAXTAB && !pTab[nCountTab] ) ++nCountTab; @@ -2508,7 +2508,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, { USHORT nDelFlags = nFlags; if (nDelFlags & IDF_CONTENTS) - nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! + nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! SCTAB nSrcTab = rSrcArea.aStart.Tab(); @@ -2522,7 +2522,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCTAB nCount = GetTableCount(); for (SCTAB i=0; iSetDirty(); } - // Charts werden zwar auch ohne AutoCalc im Tracking auf Dirty gesetzt, - // wenn alle Formeln dirty sind, werden die Charts aber nicht mehr erwischt - // (#45205#) - darum alle Charts nochmal explizit + // Charts werden zwar auch ohne AutoCalc im Tracking auf Dirty gesetzt, + // wenn alle Formeln dirty sind, werden die Charts aber nicht mehr erwischt + // (#45205#) - darum alle Charts nochmal explizit if (pChartListenerCollection) pChartListenerCollection->SetDirty(); @@ -2934,7 +2934,7 @@ void ScDocument::SetDirty() void ScDocument::SetDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = GetAutoCalc(); - bAutoCalc = FALSE; // keine Mehrfachberechnung + bAutoCalc = FALSE; // keine Mehrfachberechnung { // scope for bulk broadcast ScBulkBroadcast aBulkBroadcast( GetBASM()); SCTAB nTab2 = rRange.aEnd.Tab(); @@ -2948,7 +2948,7 @@ void ScDocument::SetDirty( const ScRange& rRange ) void ScDocument::SetTableOpDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = GetAutoCalc(); - bAutoCalc = FALSE; // no multiple recalculation + bAutoCalc = FALSE; // no multiple recalculation SCTAB nTab2 = rRange.aEnd.Tab(); for (SCTAB i=rRange.aStart.Tab(); i<=nTab2; i++) if (pTab[i]) pTab[i]->SetTableOpDirty( rRange ); @@ -3050,8 +3050,8 @@ void ScDocument::CalcAfterLoad() { SCTAB i; - if (bIsClip) // Excel-Dateien werden aus dem Clipboard in ein Clip-Doc geladen - return; // dann wird erst beim Einfuegen in das richtige Doc berechnet + if (bIsClip) // Excel-Dateien werden aus dem Clipboard in ein Clip-Doc geladen + return; // dann wird erst beim Einfuegen in das richtige Doc berechnet bCalcingAfterLoad = TRUE; for ( i = 0; i <= MAXTAB; i++) @@ -3060,7 +3060,7 @@ void ScDocument::CalcAfterLoad() if (pTab[i]) pTab[i]->SetDirtyAfterLoad(); bCalcingAfterLoad = FALSE; - SetDetectiveDirty(FALSE); // noch keine wirklichen Aenderungen + SetDetectiveDirty(FALSE); // noch keine wirklichen Aenderungen // #i112436# If formula cells are already dirty, they don't broadcast further changes. // So the source ranges of charts must be interpreted even if they are not visible, @@ -3096,7 +3096,7 @@ void ScDocument::ResetChanged( const ScRange& rRange ) } // -// Spaltenbreiten / Zeilenhoehen -------------------------------------- +// Spaltenbreiten / Zeilenhoehen -------------------------------------- // @@ -3288,7 +3288,7 @@ BOOL ScDocument::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, U const Fraction& rZoomX, const Fraction& rZoomY, BOOL bShrink ) { -//! MarkToMulti(); +//! MarkToMulti(); if ( ValidTab(nTab) && pTab[nTab] ) return pTab[nTab]->SetOptimalHeight( nStartRow, nEndRow, nExtra, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bShrink ); @@ -3321,7 +3321,7 @@ void ScDocument::UpdateAllRowHeights( OutputDevice* pDev, double nPPTX, double n // -// Spalten-/Zeilen-Flags ---------------------------------------------- +// Spalten-/Zeilen-Flags ---------------------------------------------- // void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow) @@ -3507,7 +3507,7 @@ bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow) { if (!ValidTab(nTab) || !pTab[nTab]) { - rLastRow = nRow; + rLastRow = nRow; return false; } @@ -3527,7 +3527,7 @@ bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol) { if (!ValidTab(nTab) || !pTab[nTab]) { - rLastCol = nCol; + rLastCol = nCol; return false; } @@ -3707,7 +3707,7 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize) const { const ScBitMaskCompressedArray< SCROW, BYTE> * pRowFlagsArray; - if ( ValidTab(nTab) && pTab[nTab] && ((pRowFlagsArray = pTab[nTab]->GetRowFlagsArray()) != NULL) && + if ( ValidTab(nTab) && pTab[nTab] && ((pRowFlagsArray = pTab[nTab]->GetRowFlagsArray()) != NULL) && pTab[nTab]->mpRowHeights && pTab[nTab]->mpHiddenRows ) { size_t nIndex; // ignored @@ -3813,7 +3813,7 @@ void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, S } // -// Attribute ---------------------------------------------------------- +// Attribute ---------------------------------------------------------- // const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const @@ -3953,7 +3953,7 @@ void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, } -const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const +const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( VALIDTAB(nTab) && pTab[nTab] ) return pTab[nTab]->GetStyle(nCol, nRow); @@ -3962,10 +3962,10 @@ const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) c } -const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const +const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const { - BOOL bEqual = TRUE; - BOOL bFound; + BOOL bEqual = TRUE; + BOOL bFound; const ScStyleSheet* pStyle = NULL; const ScStyleSheet* pNewStyle; @@ -3978,7 +3978,7 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con if (bFound) { if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -3995,7 +3995,7 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con if (bFound) { if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -4017,7 +4017,7 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL b if ( pStyleSheet && pStyleSheet->GetName() == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) { - // update attributes for all note objects + // update attributes for all note objects ScDetectiveFunc::UpdateAllComments( *this ); } } @@ -4111,13 +4111,13 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL { ScMergePatternState aState; - if ( rMark.IsMultiMarked() ) // multi selection + if ( rMark.IsMultiMarked() ) // multi selection { for (SCTAB i=0; i<=MAXTAB; i++) if (pTab[i] && rMark.GetTableSelect(i)) pTab[i]->MergeSelectionPattern( aState, rMark, bDeep ); } - if ( rMark.IsMarked() ) // simle selection + if ( rMark.IsMarked() ) // simle selection { ScRange aRange; rMark.GetMarkArea(aRange); @@ -4132,7 +4132,7 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL if (aState.pItemSet) return new ScPatternAttr( aState.pItemSet ); else - return new ScPatternAttr( GetPool() ); // empty + return new ScPatternAttr( GetPool() ); // empty } @@ -4145,8 +4145,8 @@ const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, B void ScDocument::GetSelectionFrame( const ScMarkData& rMark, - SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ) + SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ) { rLineOuter.SetLine(NULL, BOX_LINE_TOP); rLineOuter.SetLine(NULL, BOX_LINE_BOTTOM); @@ -4175,7 +4175,7 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark, aRange.aEnd.Col(), aRange.aEnd.Row() ); } - // Don't care Status auswerten + // Don't care Status auswerten rLineInner.SetValid( VALID_LEFT, ( aFlags.nLeft != SC_LINE_DONTCARE ) ); rLineInner.SetValid( VALID_RIGHT, ( aFlags.nRight != SC_LINE_DONTCARE ) ); @@ -4290,7 +4290,7 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const { - //! Seitengrenzen fuer Druck beruecksichtigen !!!!! + //! Seitengrenzen fuer Druck beruecksichtigen !!!!! const SvxBoxItem* pThisAttr = (const SvxBoxItem*) GetEffItem( nCol, nRow, nTab, ATTR_BORDER ); DBG_ASSERT(pThisAttr,"wo ist das Attribut?"); @@ -4464,7 +4464,7 @@ BOOL ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRo BOOL ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ) { - // if rCell is part of a matrix formula, return its complete range + // if rCell is part of a matrix formula, return its complete range BOOL bRet = FALSE; ScBaseCell* pCell = GetCell( rCellPos ); @@ -4523,7 +4523,7 @@ BOOL ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, IsVerOverlapped()) --rStartRow; - //! weiterreichen ? + //! weiterreichen ? ScAttrArray* pAttrArray = pTab[nTab]->aCol[nOldCol].pAttrArray; SCSIZE nIndex; @@ -4642,8 +4642,8 @@ BOOL ScDocument::ExtendMerge( ScRange& rRange, BOOL bRefresh, BOOL bAttrs ) BOOL ScDocument::ExtendTotalMerge( ScRange& rRange ) { - // Bereich genau dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen getroffen werden + // Bereich genau dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen getroffen werden BOOL bRet = FALSE; ScRange aExt = rRange; @@ -4715,11 +4715,11 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nDBEndCol; SCROW nDBEndRow; - // Autofilter loeschen + // Autofilter loeschen BOOL bChange = RemoveFlagsTab( nStartCol,nStartRow, nEndCol,nEndRow, nTab, SC_MF_AUTO ); - // Autofilter setzen + // Autofilter setzen for (i=0; iGetItemSet(); USHORT nFirst = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue(); if ( nFirst != 0 ) - return TRUE; // Seitennummer in neuer Vorlage angegeben + return TRUE; // Seitennummer in neuer Vorlage angegeben } } } - return FALSE; // sonst nicht + return FALSE; // sonst nicht } SfxUndoManager* ScDocument::GetUndoManager() diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx index d97900e6b904..89caa2660836 100644 --- a/sc/source/core/data/dpcachetable.cxx +++ b/sc/source/core/data/dpcachetable.cxx @@ -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 @@ -88,7 +88,7 @@ bool ScDPCacheTable::FilterItem::match( const ScDPItemData& rCellData ) const } // ---------------------------------------------------------------------------- -ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) +ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) { maItem.maString = aString; maItem.mfValue = fValue; @@ -117,7 +117,7 @@ bool ScDPCacheTable::SingleFilter::hasValue() const // ---------------------------------------------------------------------------- -ScDPCacheTable::GroupFilter::GroupFilter() +ScDPCacheTable::GroupFilter::GroupFilter() { } @@ -157,8 +157,8 @@ ScDPCacheTable::Criterion::Criterion() : // ---------------------------------------------------------------------------- -ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : - mpCache( NULL ), +ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : + mpCache( NULL ), mpNoneCache( NULL ) { if ( nId >= 0 ) @@ -189,7 +189,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -201,7 +201,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -214,11 +214,11 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, bRepeatIfEmpty ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(false); - if ( lcl_HasQueryEntry(rQuery) && + if ( lcl_HasQueryEntry(rQuery) && !GetCache()->ValidQuery( nRow , rQuery, pSpecial ) ) continue; if ( bIgnoreEmptyRows && GetCache()->IsRowEmpty( nRow ) ) @@ -244,7 +244,7 @@ void ScDPCacheTable::fillTable() if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -256,7 +256,7 @@ void ScDPCacheTable::fillTable() // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -269,7 +269,7 @@ void ScDPCacheTable::fillTable() { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, false ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(true); @@ -310,7 +310,7 @@ void ScDPCacheTable::filterByPageDimension(const vector& rCriteria, c } const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const -{ +{ SCROW nId= GetCache()->GetItemDataId(nCol, nRow, bRepeatIfEmpty); return GetCache()->GetItemDataById( nCol, nId ); } @@ -318,7 +318,7 @@ const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeat void ScDPCacheTable::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const { const ScDPItemData* pData = getCell( nCol, nRow, bRepeatIfEmpty ); - + if (pData) { rVal.fValue = pData->IsValue() ? pData->GetValue() : 0.0; @@ -348,7 +348,7 @@ const ::std::vector& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn return maFieldEntries[nColumn]; } -void ScDPCacheTable::filterTable(const vector& rCriteria, Sequence< Sequence >& rTabData, +void ScDPCacheTable::filterTable(const vector& rCriteria, Sequence< Sequence >& rTabData, const hash_set& rRepeatIfEmptyDims) { sal_Int32 nRowSize = getRowSize(); diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 21669eb7a435..56655a2f0ace 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -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/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx index 6b84d37d8d0f..9c5539eb7956 100755 --- a/sc/source/core/data/dpglobal.cxx +++ b/sc/source/core/data/dpglobal.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -84,7 +84,7 @@ namespace ScDPGlobal { continue; } - return false; + return false; } } } @@ -93,7 +93,7 @@ namespace ScDPGlobal return true; } //end - + } // -------------------------------------------------------------------- // ScDPItemDataPool @@ -126,16 +126,16 @@ sal_Int32 ScDPItemDataPool::getDataId( const ScDPItemData& aData ) DataHash::const_iterator itr = maItemIds.find( aData), itrEnd = maItemIds.end(); if ( itr == itrEnd ) - // not exist + // not exist return -1; - + else //exist return itr->second; } sal_Int32 ScDPItemDataPool::insertData( const ScDPItemData& aData ) -{ +{ sal_Int32 nResult = getDataId( aData ); if( nResult < 0 ) diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index edb3b787b9b2..586dd002448c 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -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 @@ -79,8 +79,8 @@ const sal_Int32 SC_DP_DATE_FIRST = -1; const sal_Int32 SC_DP_DATE_LAST = 10000; // ============================================================================ -namespace -{ +namespace +{ BOOL lcl_Search( SCCOL nSourceDim, ScDPTableDataCache* pCache , const std::vector< SCROW >& vIdx, SCROW nNew , SCROW& rIndex) { rIndex = vIdx.size(); @@ -92,7 +92,7 @@ namespace while (nLo <= nHi) { nIndex = (nLo + nHi) / 2; - + const ScDPItemData* pData = pCache->GetItemDataById( nSourceDim, vIdx[nIndex] ); const ScDPItemData* pDataInsert = pCache->GetItemDataById( nSourceDim, nNew ); @@ -115,9 +115,9 @@ namespace void lcl_Insert( SCCOL nSourceDim, ScDPTableDataCache* pCache , std::vector< SCROW >& vIdx, SCROW nNew ) { - SCROW nIndex = 0; - if ( !lcl_Search( nSourceDim, pCache, vIdx, nNew ,nIndex ) ) - vIdx.insert( vIdx.begin()+nIndex, nNew ); + SCROW nIndex = 0; + if ( !lcl_Search( nSourceDim, pCache, vIdx, nNew ,nIndex ) ) + vIdx.insert( vIdx.begin()+nIndex, nNew ); } template @@ -279,7 +279,7 @@ namespace class ScDPGroupDateFilter : public ScDPCacheTable::FilterBase { public: - ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, + ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, const Date* pNullDate, const ScDPNumGroupInfo* pNumInfo); // Wang Xu Ming -- 2009-8-17 @@ -298,7 +298,7 @@ private: // ---------------------------------------------------------------------------- -ScDPGroupDateFilter::ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, +ScDPGroupDateFilter::ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, const Date* pNullDate, const ScDPNumGroupInfo* pNumInfo) : mpNullDate(pNullDate), mpNumInfo(pNumInfo), @@ -316,7 +316,7 @@ bool ScDPGroupDateFilter::match( const ScDPItemData & rCellData ) const if ( !rCellData.IsValue() ) return false; -// ScDPCacheCell rCell( rCellData.fValue ); +// ScDPCacheCell rCell( rCellData.fValue ); if (!mpNumInfo) return false; @@ -329,7 +329,7 @@ bool ScDPGroupDateFilter::match( const ScDPItemData & rCellData ) const if ( rCellData.GetValue() > mpNumInfo->End && !approxEqual(rCellData.GetValue(), mpNumInfo->End) ) return static_cast(mfMatchValue) == SC_DP_DATE_LAST; - if (mnDatePart == DataPilotFieldGroupBy::HOURS || mnDatePart == DataPilotFieldGroupBy::MINUTES || + if (mnDatePart == DataPilotFieldGroupBy::HOURS || mnDatePart == DataPilotFieldGroupBy::MINUTES || mnDatePart == DataPilotFieldGroupBy::SECONDS) { // handle time @@ -593,7 +593,7 @@ BOOL lcl_DateContained( sal_Int32 nGroupPart, const ScDPItemData& rGroupData, bContained = ( nGroupValue == nCompare ); } break; - + // other parts: everything is contained } @@ -673,16 +673,16 @@ void ScDPDateGroupHelper::FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCach for ( sal_Int32 nValue = nStart; nValue <= nEnd; nValue++ ) { - String aName = lcl_GetDateGroupName( nDatePart, nValue, pFormatter ); + String aName = lcl_GetDateGroupName( nDatePart, nValue, pFormatter ); lcl_InsertValue( nSourceDim, pCache, rEntries, aName, nValue, nDatePart ); } // add first/last entry (min/max) - String aFirstName = lcl_GetSpecialDateName( aNumInfo.Start, true, pFormatter ); + String aFirstName = lcl_GetSpecialDateName( aNumInfo.Start, true, pFormatter ); lcl_InsertValue( nSourceDim, pCache, rEntries, aFirstName, SC_DP_DATE_FIRST, nDatePart ); - String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter ); - lcl_InsertValue( nSourceDim, pCache, rEntries, aLastName, SC_DP_DATE_LAST, nDatePart ); + String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter ); + lcl_InsertValue( nSourceDim, pCache, rEntries, aLastName, SC_DP_DATE_LAST, nDatePart ); } // ----------------------------------------------------------------------- @@ -751,13 +751,13 @@ ScDPGroupDimension::ScDPGroupDimension( const ScDPGroupDimension& rOther ) : nGroupDim( rOther.nGroupDim ), aGroupName( rOther.aGroupName ), pDateHelper( NULL ), - aItems( rOther.aItems ) + aItems( rOther.aItems ) { if ( rOther.pDateHelper ) pDateHelper = new ScDPDateGroupHelper( *rOther.pDateHelper ); } -ScDPGroupDimension& ScDPGroupDimension::operator=( const ScDPGroupDimension& rOther ) +ScDPGroupDimension& ScDPGroupDimension::operator=( const ScDPGroupDimension& rOther ) { nSourceDim = rOther.nSourceDim; nGroupDim = rOther.nGroupDim; @@ -794,8 +794,8 @@ const std::vector< SCROW >& ScDPGroupDimension::GetColumnEntries( const ScDPCac { if ( maMemberEntries.empty() ) { - if ( pDateHelper ) - { + if ( pDateHelper ) + { pDateHelper->FillColumnEntries( (SCCOL)GetSourceDim(), rCacheTable.GetCache(), maMemberEntries, rOriginal ); } else @@ -852,7 +852,7 @@ const ScDPGroupItem* ScDPGroupDimension::GetGroupByIndex( size_t nIndex ) const void ScDPGroupDimension::DisposeData() { - maMemberEntries.clear(); + maMemberEntries.clear(); } // ----------------------------------------------------------------------- @@ -861,7 +861,7 @@ ScDPNumGroupDimension::ScDPNumGroupDimension() : pDateHelper( NULL ), bHasNonInteger( false ), cDecSeparator( 0 ) -{ +{ } ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : @@ -871,7 +871,7 @@ ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : cDecSeparator( 0 ) { } - + ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupDimension& rOther ) : aGroupInfo( rOther.aGroupInfo ), pDateHelper( NULL ), @@ -946,7 +946,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD for (size_t nOriginalPos=0; nOriginalPosGetItemDataById( nSourceDim , rOriginal[nOriginalPos] ); - + if ( pItemData && pItemData ->HasStringData() ) { lcl_Insert( nSourceDim, pCache, maMemberEntries, rOriginal[nOriginalPos] ); @@ -1003,7 +1003,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD { String aName = lcl_GetNumGroupName( fLoop, aGroupInfo, bHasNonInteger, cDecSeparator, pFormatter ); // create a numerical entry to ensure proper sorting - // (in FillMemberResults this needs special handling) + // (in FillMemberResults this needs special handling) lcl_InsertValue( nSourceDim, pCache, maMemberEntries, aName, fLoop ); ++nLoopCount; fLoop = aGroupInfo.Start + nLoopCount * aGroupInfo.Step; @@ -1016,7 +1016,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD lcl_InsertValue( nSourceDim, pCache, maMemberEntries, aFirstName, aGroupInfo.Start - aGroupInfo.Step ); String aLastName = lcl_GetSpecialNumGroupName( aGroupInfo.End, false, cDecSeparator, aGroupInfo.DateValues, pFormatter ); - lcl_InsertValue( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.End + aGroupInfo.Step ); + lcl_InsertValue( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.End + aGroupInfo.Step ); } } return maMemberEntries; @@ -1091,7 +1091,7 @@ long ScDPGroupTableData::GetMembersCount( long nDim ) const std::vector< SCROW >& members = GetColumnEntries( nDim ); return members.size(); } -const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn ) +const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn ) { if ( nColumn >= nSourceCount ) { @@ -1118,11 +1118,11 @@ const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn } const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId ) -{ +{ if ( nDim >= nSourceCount ) { if ( getIsDataLayoutDimension( nDim) ) - nDim = nSourceCount; + nDim = nSourceCount; else { const ScDPGroupDimension& rGroupDim = aGroups[nDim - nSourceCount]; @@ -1244,7 +1244,7 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector& ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = itr->mnFieldIndex; aCri.mpFilter.reset(new ScDPGroupDateFilter( - pFilter->getMatchValue(), pDateHelper->GetDatePart(), + pFilter->getMatchValue(), pDateHelper->GetDatePart(), pDoc->GetFormatTable()->GetNullDate(), &pDateHelper->GetNumInfo())); aNewCriteria.push_back(aCri); @@ -1269,7 +1269,7 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector& ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = nSrcDim; // use the source dimension, not the group dimension. aCri.mpFilter.reset(new ScDPGroupDateFilter( - pFilter->getMatchValue(), pDateHelper->GetDatePart(), + pFilter->getMatchValue(), pDateHelper->GetDatePart(), pDoc->GetFormatTable()->GetNullDate(), &pDateHelper->GetNumInfo())); aNewCriteria.push_back(aCri); @@ -1292,13 +1292,13 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector& // End Comments if (!pGrpItem || !pGrpItem->GetName().IsCaseInsEqual(aName)) continue; - + ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = nSrcDim; aCri.mpFilter.reset(new ScDPCacheTable::GroupFilter()); - ScDPCacheTable::GroupFilter* pGrpFilter = + ScDPCacheTable::GroupFilter* pGrpFilter = static_cast(aCri.mpFilter.get()); - + pGrpItem->FillGroupFilter(*pGrpFilter); aNewCriteria.push_back(aCri); } @@ -1372,7 +1372,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt pDateHelper = rGroupDim.GetDateHelper(); if ( !pDateHelper ) // date is handled below { - const ScDPGroupItem* pGroupItem = rGroupDim.GetGroupForData( *GetMemberById( nSourceDim, pItemDataIndex[nDim] )); + const ScDPGroupItem* pGroupItem = rGroupDim.GetGroupForData( *GetMemberById( nSourceDim, pItemDataIndex[nDim] )); if ( pGroupItem ) pItemDataIndex[nDim] = pCache->GetAdditionalItemID( pGroupItem->GetName() ); } @@ -1400,7 +1400,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt } if ( pDateHelper ) - { + { const ScDPItemData* pData = GetCacheTable().GetCache()->GetItemDataById( (SCCOL)nSourceDim, pItemDataIndex[nDim]); if ( pData ->IsValue() ) { @@ -1409,7 +1409,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt &pDateHelper->GetNumInfo() ); // Wang Xu Ming -- 2009-9-7 // DataPilot Migration - Cache&&Performance - //String aName = lcl_GetDateGroupName( pDateHelper, nPartValue, pDoc->GetFormatTable() ); + //String aName = lcl_GetDateGroupName( pDateHelper, nPartValue, pDoc->GetFormatTable() ); ScDPItemData aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART ); pItemDataIndex[nDim] = GetCacheTable().GetCache()->GetAdditionalItemID( aItemData ); // End Comments @@ -1581,7 +1581,7 @@ long ScDPGroupTableData::GetSourceDim( long nDim ) } long ScDPGroupTableData::Compare( long nDim, long nDataId1, long nDataId2) { - if ( getIsDataLayoutDimension(nDim) ) + if ( getIsDataLayoutDimension(nDim) ) return 0; return ScDPItemData::Compare( *GetMemberById(nDim, nDataId1),*GetMemberById(nDim, nDataId2) ); } diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index e994339f4a9a..5e6bae7bc5a3 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -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 @@ -42,8 +42,8 @@ #include "dpgroup.hxx" #include "document.hxx" #include "rechead.hxx" -#include "pivot.hxx" // PIVOT_DATA_FIELD -#include "dapiuno.hxx" // ScDataPilotConversion +#include "pivot.hxx" // PIVOT_DATA_FIELD +#include "dapiuno.hxx" // ScDataPilotConversion #include "miscuno.hxx" #include "scerrors.hxx" #include "refupdat.hxx" @@ -75,7 +75,7 @@ #include #include #include -#include // IsNumberFormat +#include // IsNumberFormat #include #include @@ -97,35 +97,35 @@ using ::rtl::OUString; // ----------------------------------------------------------------------- -#define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" +#define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" // ----------------------------------------------------------------------- // incompatible versions of data pilot files -#define SC_DP_VERSION_CURRENT 6 +#define SC_DP_VERSION_CURRENT 6 // type of source data -#define SC_DP_SOURCE_SHEET 0 -#define SC_DP_SOURCE_DATABASE 1 -#define SC_DP_SOURCE_SERVICE 2 +#define SC_DP_SOURCE_SHEET 0 +#define SC_DP_SOURCE_DATABASE 1 +#define SC_DP_SOURCE_SERVICE 2 // ----------------------------------------------------------------------- -//! move to a header file -#define DP_PROP_COLUMNGRAND "ColumnGrand" -#define DP_PROP_FUNCTION "Function" -#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -//#define DP_PROP_ISVISIBLE "IsVisible" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_ORIGINAL "Original" -#define DP_PROP_POSITION "Position" -#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" -#define DP_PROP_ROWGRAND "RowGrand" -#define DP_PROP_SHOWDETAILS "ShowDetails" -#define DP_PROP_SHOWEMPTY "ShowEmpty" -#define DP_PROP_SUBTOTALS "SubTotals" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +//! move to a header file +#define DP_PROP_COLUMNGRAND "ColumnGrand" +#define DP_PROP_FUNCTION "Function" +#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +//#define DP_PROP_ISVISIBLE "IsVisible" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_ORIGINAL "Original" +#define DP_PROP_POSITION "Position" +#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" +#define DP_PROP_ROWGRAND "RowGrand" +#define DP_PROP_SHOWDETAILS "ShowDetails" +#define DP_PROP_SHOWEMPTY "ShowEmpty" +#define DP_PROP_SUBTOTALS "SubTotals" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" // ----------------------------------------------------------------------- @@ -147,7 +147,7 @@ USHORT lcl_GetDataGetOrientation( const uno::Reference(NULL)), + mpTableData(static_cast(NULL)), pOutput( NULL ), bSettingsChanged( FALSE ), bAlive( FALSE ), @@ -252,7 +252,7 @@ void ScDPObject::SetSaveData(const ScDPSaveData& rData) // End Comments } - InvalidateData(); // re-init source from SaveData + InvalidateData(); // re-init source from SaveData } void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex) @@ -262,7 +262,7 @@ void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex) sal_uInt16 ScDPObject::GetAutoFormatIndex() const { - return mnAutoFormatIndex; + return mnAutoFormatIndex; } void ScDPObject::SetHeaderLayout (bool bUseGrid) @@ -286,7 +286,7 @@ void ScDPObject::SetOutRange(const ScRange& rRange) void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) { if ( pSheetDesc && rDesc == *pSheetDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pImpDesc ); DELETEZ( pServDesc ); @@ -294,7 +294,7 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) delete pImpDesc; pSheetDesc = new ScSheetSourceDesc(rDesc); - // make valid QueryParam + // make valid QueryParam pSheetDesc->aQueryParam.nCol1 = pSheetDesc->aSourceRange.aStart.Col(); pSheetDesc->aQueryParam.nRow1 = pSheetDesc->aSourceRange.aStart.Row(); @@ -302,13 +302,13 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) pSheetDesc->aQueryParam.nRow2 = pSheetDesc->aSourceRange.aEnd.Row();; pSheetDesc->aQueryParam.bHasHeader = TRUE; - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) { if ( pImpDesc && rDesc == *pImpDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pSheetDesc ); DELETEZ( pServDesc ); @@ -316,13 +316,13 @@ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) delete pImpDesc; pImpDesc = new ScImportSourceDesc(rDesc); - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) { if ( pServDesc && rDesc == *pServDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pSheetDesc ); DELETEZ( pImpDesc ); @@ -330,7 +330,7 @@ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) delete pServDesc; pServDesc = new ScDPServiceDesc(rDesc); - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const @@ -342,7 +342,7 @@ void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const else if ( pServDesc ) rDest.SetServiceData( *pServDesc ); - // name/tag are not source data, but needed along with source data + // name/tag are not source data, but needed along with source data rDest.aTableName = aTableName; rDest.aTableTag = aTableTag; @@ -375,7 +375,7 @@ bool ScDPObject::IsDataDescriptionCell(const ScAddress& rPos) long nDataDimCount = pSaveData->GetDataDimensionCount(); if (nDataDimCount != 1) - // There has to be exactly one data dimension for the description to + // There has to be exactly one data dimension for the description to // appear at top-left corner. return false; @@ -418,9 +418,9 @@ void ScDPObject::CreateOutput() aStart.SetRow(nNewRow); pOutput->SetPosition( aStart ); - //! modify aOutRange? + //! modify aOutRange? - bAllowMove = FALSE; // use only once + bAllowMove = FALSE; // use only once } } } @@ -477,18 +477,18 @@ void ScDPObject::CreateObjects() if (!xSource.is()) { - //! cache DPSource and/or Output? + //! cache DPSource and/or Output? DBG_ASSERT( bAlive, "CreateObjects on non-inserted DPObject" ); - DELETEZ( pOutput ); // not valid when xSource is changed + DELETEZ( pOutput ); // not valid when xSource is changed if ( pServDesc ) { xSource = CreateSource( *pServDesc ); } - if ( !xSource.is() ) // database or sheet data, or error in CreateSource + if ( !xSource.is() ) // database or sheet data, or error in CreateSource { DBG_ASSERT( !pServDesc, "DPSource could not be created" ); ScDPTableData* pData = GetTableData(); @@ -507,7 +507,7 @@ void ScDPObject::CreateObjects() } else if (bSettingsChanged) { - DELETEZ( pOutput ); // not valid when xSource is changed + DELETEZ( pOutput ); // not valid when xSource is changed uno::Reference xRef( xSource, uno::UNO_QUERY ); if (xRef.is()) @@ -553,21 +553,21 @@ void ScDPObject::InvalidateSource() ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done - rOverflow = pOutput->HasError(); // range overflow or exception from source + rOverflow = pOutput->HasError(); // range overflow or exception from source if ( rOverflow ) return ScRange( aOutRange.aStart ); else { - // don't store the result in aOutRange, because nothing has been output yet + // don't store the result in aOutRange, because nothing has been output yet return pOutput->GetOutputRange(); } } void ScDPObject::Output( const ScAddress& rPos ) { - // clear old output area + // clear old output area pDoc->DeleteAreaTab( aOutRange.aStart.Col(), aOutRange.aStart.Row(), aOutRange.aEnd.Col(), aOutRange.aEnd.Row(), aOutRange.aStart.Tab(), IDF_ALL ); @@ -575,13 +575,13 @@ void ScDPObject::Output( const ScAddress& rPos ) aOutRange.aEnd.Col(), aOutRange.aEnd.Row(), aOutRange.aStart.Tab(), SC_MF_AUTO ); - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done pOutput->SetPosition( rPos ); pOutput->Output(); - // aOutRange is always the range that was last output to the document + // aOutRange is always the range that was last output to the document aOutRange = pOutput->GetOutputRange(); const ScAddress& s = aOutRange.aStart; const ScAddress& e = aOutRange.aEnd; @@ -623,7 +623,7 @@ void ScDPObject::RefreshAfterLoad() pDoc->IsBlockEmpty( nTab, nFirstCol, nFirstRow + nInitial, nFirstCol, nFirstRow + nInitial ) && aOutRange.aEnd.Col() > nFirstCol ) { - BOOL bFilterButton = IsSheetData(); // when available, filter button setting must be checked here + BOOL bFilterButton = IsSheetData(); // when available, filter button setting must be checked here SCROW nSkip = bFilterButton ? 1 : 0; for (SCROW nPos=nSkip; nPosaQueryParam; aNewDesc.aQueryParam.nCol1 = sal::static_int_cast( aNewDesc.aQueryParam.nCol1 + nDiffX ); aNewDesc.aQueryParam.nCol2 = sal::static_int_cast( aNewDesc.aQueryParam.nCol2 + nDiffX ); - aNewDesc.aQueryParam.nRow1 += nDiffY; //! used? - aNewDesc.aQueryParam.nRow2 += nDiffY; //! used? + aNewDesc.aQueryParam.nRow1 += nDiffY; //! used? + aNewDesc.aQueryParam.nRow2 += nDiffY; //! used? SCSIZE nEC = aNewDesc.aQueryParam.GetEntryCount(); for (SCSIZE i=0; iIsFilterButton( rPos ); } long ScDPObject::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done return pOutput->GetHeaderDim( rPos, rOrient ); } @@ -1072,7 +1072,7 @@ long ScDPObject::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) BOOL ScDPObject::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done return pOutput->GetHeaderDrag( rPos, bMouseLeft, bMouseTop, nDragDim, rPosRect, rOrient, rDimPos ); } @@ -1118,7 +1118,7 @@ bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndP } else aBuffer.append( cNext ); - + ++nPos; } // no closing quote before the end of the string -> error (bRet still false) @@ -1295,7 +1295,7 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc if ( cNext == ' ' || ( bAllowBracket && cNext == '[' ) ) bValid = true; } - + if ( bValid ) { rMatched = nMatchList; @@ -1523,9 +1523,9 @@ BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget, void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj) { - CreateObjects(); // create xSource if not already done + CreateObjects(); // create xSource if not already done - // find dimension name + // find dimension name uno::Reference xDim; uno::Reference xDimsName = xSource->getDimensions(); @@ -1546,12 +1546,12 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); if (bDataLayout) { - // the elements of the data layout dimension can't be found by their names - // -> don't change anything + // the elements of the data layout dimension can't be found by their names + // -> don't change anything return; } - // query old state + // query old state long nHierCount = 0; uno::Reference xHiers; @@ -1610,21 +1610,21 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb DBG_ASSERT( bFound, "member not found" ); - //! use Hierarchy and Level in SaveData !!!! + //! use Hierarchy and Level in SaveData !!!! - // modify pDestObj if set, this object otherwise + // modify pDestObj if set, this object otherwise ScDPSaveData* pModifyData = pDestObj ? ( pDestObj->pSaveData ) : pSaveData; DBG_ASSERT( pModifyData, "no data?" ); if ( pModifyData ) { const String aName = rElemDesc.MemberName; pModifyData->GetDimensionByName(aDimName)-> - GetMemberByName(aName)->SetShowDetails( !bShowDetails ); // toggle + GetMemberByName(aName)->SetShowDetails( !bShowDetails ); // toggle if ( pDestObj ) - pDestObj->InvalidateData(); // re-init source from SaveData + pDestObj->InvalidateData(); // re-init source from SaveData else - InvalidateData(); // re-init source from SaveData + InvalidateData(); // re-init source from SaveData } } @@ -1639,10 +1639,10 @@ long lcl_FindName( const rtl::OUString& rString, const uno::Reference& xDimProp ) // PIVOT_FUNC mask +USHORT lcl_FirstSubTotal( const uno::Reference& xDimProp ) // PIVOT_FUNC mask { uno::Reference xDimSupp( xDimProp, uno::UNO_QUERY ); if ( xDimProp.is() && xDimSupp.is() ) @@ -1715,8 +1715,8 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, SCSIZE nCount = (nOrient == sheet::DataPilotFieldOrientation_PAGE) ? PIVOT_MAXPAGEFIELD : PIVOT_MAXFIELD; - //! merge multiple occurences (data field with different functions) - //! force data field in one dimension + //! merge multiple occurences (data field with different functions) + //! force data field in one dimension std::vector< long > aPos( nCount, 0 ); @@ -1741,13 +1741,13 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, sheet::GeneralFunction_NONE ); if ( eFunc == sheet::GeneralFunction_AUTO ) { - //! test for numeric data + //! test for numeric data eFunc = sheet::GeneralFunction_SUM; } nMask = ScDataPilotConversion::FunctionBit(eFunc); } else - nMask = lcl_FirstSubTotal( xDimProp ); // from first hierarchy + nMask = lcl_FirstSubTotal( xDimProp ); // from first hierarchy BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); @@ -1773,18 +1773,18 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, BOOL bDupUsed = FALSE; if ( nDupSource >= 0 ) { - // add function bit to previous entry + // add function bit to previous entry SCsCOL nCompCol; if ( bDataLayout ) nCompCol = PIVOT_DATA_FIELD; else - nCompCol = static_cast(nDupSource)+nColAdd; //! seek source column from name + nCompCol = static_cast(nDupSource)+nColAdd; //! seek source column from name for (SCSIZE nOld=0; nOld= 0 ) // if source was not found (different orientation) - pFields[nOutCount].nCol = static_cast(nDupSource)+nColAdd; //! seek from name + else if ( nDupSource >= 0 ) // if source was not found (different orientation) + pFields[nOutCount].nCol = static_cast(nDupSource)+nColAdd; //! seek from name else - pFields[nOutCount].nCol = static_cast(nDim)+nColAdd; //! seek source column from name + pFields[nOutCount].nCol = static_cast(nDim)+nColAdd; //! seek source column from name pFields[nOutCount].nFuncMask = nMask; pFields[nOutCount].nFuncCount = lcl_CountBits( nMask ); @@ -1826,7 +1826,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, } } - // sort by getPosition() value + // sort by getPosition() value for (SCSIZE i=0; i+1= nCount ) // space for data field? - --nOutCount; //! error? + --nOutCount; //! error? pFields[nOutCount].nCol = PIVOT_DATA_FIELD; pFields[nOutCount].nFuncMask = 0; pFields[nOutCount].nFuncCount = 0; @@ -1853,7 +1853,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const { - ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers + ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers rParam.nCol = aOutRange.aStart.Col(); rParam.nRow = aOutRange.aStart.Row(); @@ -1974,7 +1974,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam) BOOL bDuplicated = FALSE; BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); - //! error checking -- is "IsDataLayoutDimension" property required?? + //! error checking -- is "IsDataLayoutDimension" property required?? try { @@ -2092,7 +2092,7 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< } //------------------------------------------------------------------------ -// convert old pivot tables into new datapilot tables +// convert old pivot tables into new datapilot tables String lcl_GetDimName( const uno::Reference& xSource, long nDim ) { @@ -2132,7 +2132,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, PivotField* pRefRowFields, SCSIZE nRefRowCount, PivotField* pRefPageFields, SCSIZE nRefPageCount ) { - // pDoc or xSource must be set + // pDoc or xSource must be set DBG_ASSERT( pDoc || xSource.is(), "missing string source" ); String aDocStr; @@ -2151,7 +2151,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, if ( pDoc ) pDoc->GetString( nCol, nRow, nTab, aDocStr ); else - aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 + aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 if ( aDocStr.Len() ) pDim = rSaveData.GetDimensionByName(aDocStr); @@ -2161,13 +2161,13 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, if ( pDim ) { - if ( nOrient == sheet::DataPilotFieldOrientation_DATA ) // set summary function + if ( nOrient == sheet::DataPilotFieldOrientation_DATA ) // set summary function { - // generate an individual entry for each function + // generate an individual entry for each function BOOL bFirst = TRUE; // if a dimension is used for column/row/page and data, - // use duplicated dimensions for all data occurrences + // use duplicated dimensions for all data occurrences if (pRefColFields) for (SCSIZE nRefCol=0; nRefCol also look for duplicate data column + // if set via api, a data column may occur several times + // (if the function hasn't been changed yet) -> also look for duplicate data column for (SCSIZE nPrevData=0; nPrevDataSetOrientation( nOrient ); @@ -2222,8 +2222,8 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, } pDim->SetSubTotals( nFuncCount, nFuncArray ); - // ShowEmpty was implicit in old tables, - // must be set for data layout dimension (not accessible in dialog) + // ShowEmpty was implicit in old tables, + // must be set for data layout dimension (not accessible in dialog) if ( bOldDefaults || nCol == PIVOT_DATA_FIELD ) pDim->SetShowEmpty( TRUE ); } @@ -2233,7 +2233,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, // ----------------------------------------------------------------------- -// static +// static BOOL ScDPObject::HasRegisteredSources() { BOOL bFound = FALSE; @@ -2251,13 +2251,13 @@ BOOL ScDPObject::HasRegisteredSources() return bFound; } -// static +// static uno::Sequence ScDPObject::GetRegisteredSources() { long nCount = 0; uno::Sequence aSeq(0); - // use implementation names... + // use implementation names... uno::Reference xManager = comphelper::getProcessServiceFactory(); uno::Reference xEnAc( xManager, uno::UNO_QUERY ); @@ -2270,7 +2270,7 @@ uno::Sequence ScDPObject::GetRegisteredSources() while ( xEnum->hasMoreElements() ) { uno::Any aAddInAny = xEnum->nextElement(); -// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) +// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) { uno::Reference xIntFac; aAddInAny >>= xIntFac; @@ -2297,7 +2297,7 @@ uno::Sequence ScDPObject::GetRegisteredSources() // use getContext from addincol.cxx uno::Reference getContext(uno::Reference xMSF); -// static +// static uno::Reference ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { rtl::OUString aImplName = rDesc.aServiceName; @@ -2314,7 +2314,7 @@ uno::Reference ScDPObject::CreateSource( const ScDPS while ( xEnum->hasMoreElements() && !xRet.is() ) { uno::Any aAddInAny = xEnum->nextElement(); -// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) +// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) { uno::Reference xIntFac; aAddInAny >>= xIntFac; @@ -2344,7 +2344,7 @@ uno::Reference ScDPObject::CreateSource( const ScDPS uno::Reference xInit( xInterface, uno::UNO_QUERY ); if (xInit.is()) { - // initialize + // initialize uno::Sequence aSeq(4); uno::Any* pArray = aSeq.getArray(); pArray[0] <<= rtl::OUString( rDesc.aParSource ); @@ -2419,14 +2419,14 @@ BOOL ScDPCollection::RefsEqual( const ScDPCollection& r ) const if ( ! ((const ScDPObject*)At(i))->RefsEqual( *((const ScDPObject*)r.At(i)) ) ) return FALSE; - return TRUE; // all equal + return TRUE; // all equal } void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const { if ( nCount == r.nCount ) { - //! assert equal names? + //! assert equal names? for (USHORT i=0; iWriteRefsTo( *((ScDPObject*)r.At(i)) ); } @@ -2479,9 +2479,9 @@ ScDPObject* ScDPCollection::GetByName(const String& rName) const String ScDPCollection::CreateNewName( USHORT nMin ) const { String aBase = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DataPilot")); - //! from Resource? + //! from Resource? - for (USHORT nAdd=0; nAdd<=nCount; nAdd++) // nCount+1 tries + for (USHORT nAdd=0; nAdd<=nCount; nAdd++) // nCount+1 tries { String aNewName = aBase; aNewName += String::CreateFromInt32( nMin + nAdd ); @@ -2490,9 +2490,9 @@ String ScDPCollection::CreateNewName( USHORT nMin ) const if (((const ScDPObject*)pItems[i])->GetName() == aNewName) bFound = TRUE; if (!bFound) - return aNewName; // found unused Name + return aNewName; // found unused Name } - return String(); // should not happen + return String(); // should not happen } @@ -2500,10 +2500,10 @@ String ScDPCollection::CreateNewName( USHORT nMin ) const // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance long ScDPObject::GetCacheId() const -{ +{ if ( GetSaveData() ) return GetSaveData()->GetCacheId(); - else + else return mnCacheId; } ULONG ScDPObject::RefreshCache() @@ -2515,8 +2515,8 @@ ULONG ScDPObject::RefreshCache() } CreateObjects(); - ULONG nErrId = 0; - if ( pSheetDesc) + ULONG nErrId = 0; + if ( pSheetDesc) nErrId = pSheetDesc->CheckValidate( pDoc ); if ( nErrId == 0 ) { @@ -2536,7 +2536,7 @@ ULONG ScDPObject::RefreshCache() //cache failed DBG_ASSERT( pCache , " pCache == NULL" ); return STR_ERR_DATAPILOTSOURCE; - } + } nNewId = pCache->GetId(); @@ -2551,7 +2551,7 @@ ULONG ScDPObject::RefreshCache() (*pDPCollection)[i]->SetRefresh(); } - } + } DBG_ASSERT( GetCacheId() >= 0, " GetCacheId() >= 0 " ); } return nErrId; diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index bdd6fd555b89..16f1be0ca5cc 100755 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -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 @@ -47,7 +47,7 @@ #include "docpool.hxx" #include "markdata.hxx" #include "attrib.hxx" -#include "formula/errorcodes.hxx" // errNoValue +#include "formula/errorcodes.hxx" // errNoValue #include "miscuno.hxx" #include "globstr.hrc" #include "stlpool.hxx" @@ -79,39 +79,39 @@ using ::rtl::OUString; // ----------------------------------------------------------------------- -//! move to a header file +//! move to a header file //! use names from unonames.hxx? #define DP_PROP_FUNCTION "Function" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_POSITION "Position" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -#define DP_PROP_NUMBERFORMAT "NumberFormat" -#define DP_PROP_FILTER "Filter" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_POSITION "Position" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +#define DP_PROP_NUMBERFORMAT "NumberFormat" +#define DP_PROP_FILTER "Filter" #define DP_PROP_COLUMNGRAND "ColumnGrand" #define DP_PROP_ROWGRAND "RowGrand" #define DP_PROP_SUBTOTALS "SubTotals" // ----------------------------------------------------------------------- -//! dynamic!!! -#define SC_DPOUT_MAXLEVELS 256 +//! dynamic!!! +#define SC_DPOUT_MAXLEVELS 256 struct ScDPOutLevelData { - long nDim; - long nHier; - long nLevel; - long nDimPos; - uno::Sequence aResult; + long nDim; + long nHier; + long nLevel; + long nDimPos; + uno::Sequence aResult; String maName; /// Name is the internal field name. String aCaption; /// Caption is the name visible in the output table. bool mbHasHiddenMember; ScDPOutLevelData() - { - nDim = nHier = nLevel = nDimPos = -1; + { + nDim = nHier = nLevel = nDimPos = -1; mbHasHiddenMember = false; } @@ -120,10 +120,10 @@ struct ScDPOutLevelData ( nDimPos==r.nDimPos && nHier==r.nHier && nLevelFind( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyle) { - // create new style (was in ScPivot::SetStyle) + // create new style (was in ScPivot::SetStyle) pStyle = (ScStyleSheet*) &pStlPool->Make( aStyleName, SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_USERDEF ); @@ -184,18 +184,18 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, const uno::Reference& xDims ) { if ( rFormats ) - return; // already set + return; // already set - // xLevRes is from the data layout dimension - //! use result sequence from ScDPOutLevelData! + // xLevRes is from the data layout dimension + //! use result sequence from ScDPOutLevelData! uno::Sequence aResult = xLevRes->getResults(); long nSize = aResult.getLength(); if (nSize) { - // get names/formats for all data dimensions - //! merge this with the loop to collect ScDPOutLevelData? + // get names/formats for all data dimensions + //! merge this with the loop to collect ScDPOutLevelData? String aDataNames[SC_DPOUT_MAXLEVELS]; UINT32 nDataFormats[SC_DPOUT_MAXLEVELS]; @@ -229,7 +229,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, } } - if ( bAnySet ) // forget everything if all formats are 0 (or no data dimensions) + if ( bAnySet ) // forget everything if all formats are 0 (or no data dimensions) { const sheet::MemberResult* pArray = aResult.getConstArray(); @@ -237,7 +237,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, UINT32* pNumFmt = new UINT32[nSize]; if (nDataCount == 1) { - // only one data dimension -> use its numberformat everywhere + // only one data dimension -> use its numberformat everywhere long nFormat = nDataFormats[0]; for (long nPos=0; nPos& rSeq ) { - // used to skip levels that have no members + // used to skip levels that have no members long nLen = rSeq.getLength(); const sheet::MemberResult* pArray = rSeq.getConstArray(); @@ -316,7 +316,7 @@ BOOL lcl_MemberEmpty( const uno::Sequence& rSeq ) if (pArray[i].Flags & sheet::MemberResultFlags::HASMEMBER) return FALSE; - return TRUE; // no member data -> empty + return TRUE; // no member data -> empty } uno::Sequence lcl_GetSelectedPageAsResult( const uno::Reference& xDimProp ) @@ -339,7 +339,7 @@ uno::Sequence lcl_GetSelectedPageAsResult( const uno::Refer if ( rField.Field == 0 && rField.Operator == sheet::FilterOperator_EQUAL && !rField.IsNumeric ) { rtl::OUString aSelectedPage( rField.StringValue ); - //! different name/caption string? + //! different name/caption string? sheet::MemberResult aResult( aSelectedPage, aSelectedPage, 0 ); aRet = uno::Sequence( &aResult, 1 ); } @@ -375,9 +375,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference xResult( xSource, uno::UNO_QUERY ); if ( xSource.is() && xResult.is() ) { - // get dimension results: + // get dimension results: uno::Reference xDims = new ScNameToIndexAccess( xSource->getDimensions() ); @@ -472,7 +472,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::ReferenceSetValue( nCol, nRow, nTab, rData.Value ); - // use number formats from source + // use number formats from source DBG_ASSERT( bSizesValid, "DataCell: !bSizesValid" ); UINT32 nFormat = 0; @@ -614,7 +614,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data //pDoc->SetString( nCol, nRow, nTab, EMPTY_STRING ); } - // SubTotal formatting is controlled by headers + // SubTotal formatting is controlled by headers } void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -639,14 +639,14 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( nFlags & sheet::MemberResultFlags::SUBTOTAL ) { -// SvxWeightItem aItem( WEIGHT_BOLD ); // weight is in the style +// SvxWeightItem aItem( WEIGHT_BOLD ); // weight is in the style // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - OutputImpl outputimp( pDoc, nTab, + OutputImpl outputimp( pDoc, nTab, nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, - nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); + nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); // End Comments - //! limit frames to horizontal or vertical? + //! limit frames to horizontal or vertical? if (bColHeader) { // Wang Xu Ming -- 2009-8-17 @@ -675,14 +675,14 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, } } -void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, +void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, bool bInTable, bool bPopup, bool bHasHiddenMember ) { pDoc->SetString( nCol, nRow, nTab, rCaption ); if (bInTable) lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 ); - // Button + // Button sal_uInt16 nMergeFlag = SC_MF_BUTTON; if (bPopup) nMergeFlag |= SC_MF_BUTTON_POPUP; @@ -703,8 +703,8 @@ void ScDPOutput::CalcSizes() { if (!bSizesValid) { - // get column size of data from first row - //! allow different sizes (and clear following areas) ??? + // get column size of data from first row + //! allow different sizes (and clear following areas) ??? nRowCount = aData.getLength(); const uno::Sequence* pRowAry = aData.getConstArray(); @@ -715,14 +715,14 @@ void ScDPOutput::CalcSizes() // Insert an extra header row only when there is no column field. nHeaderSize = 2; - // calculate output positions and sizes + // calculate output positions and sizes - long nPageSize = 0; //! use page fields! + long nPageSize = 0; //! use page fields! if ( bDoFilter || nPageFieldCount ) { - nPageSize += nPageFieldCount + 1; // plus one empty row + nPageSize += nPageFieldCount + 1; // plus one empty row if ( bDoFilter ) - ++nPageSize; // filter button above the page fields + ++nPageSize; // filter button above the page fields } if ( aStartPos.Col() + nRowFieldCount + nColCount - 1 > MAXCOL || @@ -732,7 +732,7 @@ void ScDPOutput::CalcSizes() } nTabStartCol = aStartPos.Col(); - nTabStartRow = aStartPos.Row() + (SCROW)nPageSize; // below page fields + nTabStartRow = aStartPos.Row() + (SCROW)nPageSize; // below page fields nMemberStartCol = nTabStartCol; nMemberStartRow = nTabStartRow + (SCROW) nHeaderSize; nDataStartCol = nMemberStartCol + (SCCOL)nRowFieldCount; @@ -740,14 +740,14 @@ void ScDPOutput::CalcSizes() if ( nColCount > 0 ) nTabEndCol = nDataStartCol + (SCCOL)nColCount - 1; else - nTabEndCol = nDataStartCol; // single column will remain empty + nTabEndCol = nDataStartCol; // single column will remain empty // if page fields are involved, include the page selection cells if ( nPageFieldCount > 0 && nTabEndCol < nTabStartCol + 1 ) nTabEndCol = nTabStartCol + 1; if ( nRowCount > 0 ) nTabEndRow = nDataStartRow + (SCROW)nRowCount - 1; else - nTabEndRow = nDataStartRow; // single row will remain empty + nTabEndRow = nDataStartRow; // single row will remain empty bSizesValid = TRUE; } } @@ -782,7 +782,7 @@ sal_Int32 ScDPOutput::GetPositionType(const ScAddress& rPos) if (bInColHeader) { if (nRow == nTabStartRow) - // first row in the column header area is always used for column + // first row in the column header area is always used for column // field buttons. return DataPilotTablePositionType::OTHER; @@ -801,35 +801,35 @@ void ScDPOutput::Output() SCTAB nTab = aStartPos.Tab(); const uno::Sequence* pRowAry = aData.getConstArray(); - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - if ( bSizeOverflow || bResultsError ) // does output area exceed sheet limits? - return; // nothing + if ( bSizeOverflow || bResultsError ) // does output area exceed sheet limits? + return; // nothing - // clear whole (new) output area - //! when modifying table, clear old area - //! include IDF_OBJECTS ??? + // clear whole (new) output area + //! when modifying table, clear old area + //! include IDF_OBJECTS ??? pDoc->DeleteAreaTab( aStartPos.Col(), aStartPos.Row(), nTabEndCol, nTabEndRow, nTab, IDF_ALL ); if ( bDoFilter ) lcl_DoFilterButton( pDoc, aStartPos.Col(), aStartPos.Row(), nTab ); - // output data results: - + // output data results: + for (long nRow=0; nRowSetString( nFldCol, nHdrRow, nTab, aPageValue ); lcl_SetFrame( pDoc,nTab, nFldCol,nHdrRow, nFldCol,nHdrRow, 20 ); pDoc->ApplyAttr( nFldCol, nHdrRow, nTab, ScMergeFlagAttr(SC_MF_AUTO) ); - //! which style? + //! which style? } - // data description - // (may get overwritten by first row field) + // data description + // (may get overwritten by first row field) String aDesc = aDataDescription; if ( !aDesc.Len() ) { - //! use default string ("result") ? + //! use default string ("result") ? } pDoc->SetString( nTabStartCol, nTabStartRow, nTab, aDesc ); - // set STR_PIVOT_STYLE_INNER for whole data area (subtotals are overwritten) + // set STR_PIVOT_STYLE_INNER for whole data area (subtotals are overwritten) if ( nDataStartRow > nTabStartRow ) lcl_SetStyleById( pDoc, nTab, nTabStartCol, nTabStartRow, nTabEndCol, nDataStartRow-1, @@ -870,26 +870,26 @@ void ScDPOutput::Output() lcl_SetStyleById( pDoc, nTab, nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow, STR_PIVOT_STYLE_INNER ); - // output column headers: + // output column headers: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - OutputImpl outputimp( pDoc, nTab, + OutputImpl outputimp( pDoc, nTab, nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, - nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); + nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); // End Comments for (nField=0; nField rSequence = pColFields[nField].aResult; const sheet::MemberResult* pArray = rSequence.getConstArray(); long nThisColCount = rSequence.getLength(); - DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? + DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? for (long nCol=0; nCol vbSetBorder; vbSetBorder.resize( nTabEndRow - nDataStartRow + 1, FALSE ); for (nField=0; nField rSequence = pRowFields[nField].aResult; const sheet::MemberResult* pArray = rSequence.getConstArray(); long nThisRowCount = rSequence.getLength(); - DBG_ASSERT( nThisRowCount == nRowCount, "count mismatch" ); //! ??? + DBG_ASSERT( nThisRowCount == nRowCount, "count mismatch" ); //! ??? for (long nRow=0; nRow aFilters; GetDataResultPositionData(aFilters, rPos); sal_Int32 nSize = aFilters.size(); - + DataPilotTableResultData aResData; aResData.FieldFilters.realloc(nSize); for (sal_Int32 i = 0; i < nSize; ++i) aResData.FieldFilters[i] = aFilters[i]; - + aResData.DataFieldIndex = 0; Reference xPropSet(xSource, UNO_QUERY); if (xPropSet.is()) @@ -1192,10 +1192,10 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa } // Copy appropriate DataResult object from the cached sheet::DataResult table. - if (aData.getLength() > nRow - nDataStartRow && + if (aData.getLength() > nRow - nDataStartRow && aData[nRow-nDataStartRow].getLength() > nCol-nDataStartCol) aResData.Result = aData[nRow-nDataStartRow][nCol-nDataStartCol]; - + rPosData.PositionData = makeAny(aResData); return; } @@ -1240,7 +1240,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa const sheet::MemberResult* pArray = rSequence.getConstArray(); long nItem = nRow - nDataStartRow; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1316,7 +1316,7 @@ bool ScDPOutput::GetDataResultPositionData(vector& DBG_ASSERT(nDataStartCol + rSequence.getLength() - 1 == nTabEndCol, "ScDPOutput::GetDataFieldCellData: error in geometric assumption"); long nItem = nCol - nDataStartCol; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1340,7 +1340,7 @@ bool ScDPOutput::GetDataResultPositionData(vector& DBG_ASSERT(nDataStartRow + rSequence.getLength() - 1 == nTabEndRow, "ScDPOutput::GetDataFieldCellData: error in geometric assumption"); long nItem = nRow - nDataStartRow; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1820,9 +1820,9 @@ BOOL ScDPOutput::IsFilterButton( const ScAddress& rPos ) SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() || !bDoFilter ) - return FALSE; // wrong sheet or no button at all + return FALSE; // wrong sheet or no button at all - // filter button is at top left + // filter button is at top left return ( nCol == aStartPos.Col() && nRow == aStartPos.Row() ); } @@ -1832,13 +1832,13 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() ) - return -1; // wrong sheet + return -1; // wrong sheet - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - // test for column header + // test for column header if ( nRow == nTabStartRow && nCol >= nDataStartCol && nCol < nDataStartCol + nColFieldCount ) { @@ -1847,7 +1847,7 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pColFields[nField].nDim; } - // test for row header + // test for row header if ( nRow+1 == nDataStartRow && nCol >= nTabStartCol && nCol < nTabStartCol + nRowFieldCount ) { @@ -1856,7 +1856,7 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pRowFields[nField].nDim; } - // test for page field + // test for page field SCROW nPageStartRow = aStartPos.Row() + ( bDoFilter ? 1 : 0 ); if ( nCol == aStartPos.Col() && nRow >= nPageStartRow && nRow < nPageStartRow + nPageFieldCount ) @@ -1866,29 +1866,29 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pPageFields[nField].nDim; } - //! single data field (?) + //! single data field (?) rOrient = sheet::DataPilotFieldOrientation_HIDDEN; - return -1; // invalid + return -1; // invalid } BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ) { - // Rectangle instead of ScRange for rPosRect to allow for negative values + // Rectangle instead of ScRange for rPosRect to allow for negative values SCCOL nCol = rPos.Col(); SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() ) - return FALSE; // wrong sheet + return FALSE; // wrong sheet - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - // test for column header + // test for column header if ( nCol >= nDataStartCol && nCol <= nTabEndCol && nRow + 1 >= nMemberStartRow && nRow < nMemberStartRow + nColFieldCount ) @@ -1899,12 +1899,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nField = 0; bMouseTop = TRUE; } - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( nDataStartCol, nMemberStartRow + nField, nTabEndCol, nMemberStartRow + nField -1 ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos= nDataStartRow && nRow <= nTabEndRow && nRowFieldCount == 0 && nCol == nTabStartCol && bMouseLeft ); @@ -1953,12 +1953,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nCol + 1 >= nTabStartCol && nCol < nTabStartCol + nRowFieldCount ) ) { long nField = nCol - nTabStartCol; - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( nTabStartCol + nField, nDataStartRow - 1, nTabStartCol + nField - 1, nTabEndRow ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos= aStartPos.Col() && nCol <= nTabEndCol && @@ -2009,12 +2009,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nField = 0; bMouseTop = TRUE; } - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( aStartPos.Col(), nPageStartRow + nField, nTabEndCol, nPageStartRow + nField - 1 ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos& xProp, const rtl::OUString& rName, sal_Bool bValue ) { - //! move to ScUnoHelpFunctions? + //! move to ScUnoHelpFunctions? xProp->setPropertyValue( rName, uno::Any( &bValue, getBooleanCppuType() ) ); } @@ -120,8 +120,8 @@ ScDPSaveMember::~ScDPSaveMember() BOOL ScDPSaveMember::operator== ( const ScDPSaveMember& r ) const { - if ( aName != r.aName || - nVisibleMode != r.nVisibleMode || + if ( aName != r.aName || + nVisibleMode != r.nVisibleMode || nShowDetailsMode != r.nShowDetailsMode ) return FALSE; @@ -286,18 +286,18 @@ ScDPSaveDimension::~ScDPSaveDimension() BOOL ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const { - if ( aName != r.aName || - bIsDataLayout != r.bIsDataLayout || - bDupFlag != r.bDupFlag || - nOrientation != r.nOrientation || - nFunction != r.nFunction || + if ( aName != r.aName || + bIsDataLayout != r.bIsDataLayout || + bDupFlag != r.bDupFlag || + nOrientation != r.nOrientation || + nFunction != r.nFunction || nUsedHierarchy != r.nUsedHierarchy || nShowEmptyMode != r.nShowEmptyMode || bSubTotalDefault != r.bSubTotalDefault || nSubTotalCount != r.nSubTotalCount ) return FALSE; - if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) ) // should not happen + if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) ) // should not happen return FALSE; long i; @@ -606,8 +606,8 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference& xD ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_FIELD_SUBTOTALNAME, *pSubTotalName); } - // Level loop outside of maMemberList loop - // because SubTotals have to be set independently of known members + // Level loop outside of maMemberList loop + // because SubTotals have to be set independently of known members long nCount = maMemberHash.size(); @@ -803,11 +803,11 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r ) BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const { if ( nColumnGrandMode != r.nColumnGrandMode || - nRowGrandMode != r.nRowGrandMode || + nRowGrandMode != r.nRowGrandMode || nIgnoreEmptyMode != r.nIgnoreEmptyMode || nRepeatEmptyMode != r.nRepeatEmptyMode || bFilterButton != r.bFilterButton || - mnCacheId != r.mnCacheId ||/// Wang Xu Ming -- 2009-6-18 DataPilot Migration + mnCacheId != r.mnCacheId ||/// Wang Xu Ming -- 2009-6-18 DataPilot Migration bDrillDown != r.bDrillDown || mbDimensionMembersBuilt != r.mbDimensionMembersBuilt) return FALSE; @@ -881,7 +881,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName) if ( pDim->GetName() == rName && !pDim->IsDataLayout() ) return pDim; } - return NULL; // don't create new + return NULL; // don't create new } ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName) @@ -923,8 +923,8 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName) { - // always insert new - //! check if dimension is there? + // always insert new + //! check if dimension is there? ScDPSaveDimension* pOld = GetDimensionByName( rName ); ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld ); @@ -1001,12 +1001,12 @@ long ScDPSaveData::GetDataDimensionCount() const void ScDPSaveData::SetPosition( ScDPSaveDimension* pDim, long nNew ) { - // position (nNew) is counted within dimensions of the same orientation + // position (nNew) is counted within dimensions of the same orientation USHORT nOrient = pDim->GetOrientation(); aDimList.Remove( pDim ); - ULONG nCount = aDimList.Count(); // after remove + ULONG nCount = aDimList.Count(); // after remove ULONG nInsPos = 0; while ( nNew > 0 && nInsPos < nCount ) @@ -1074,14 +1074,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference xSourceProp( xSource, uno::UNO_QUERY ); DBG_ASSERT( xSourceProp.is(), "no properties at source" ); if ( xSourceProp.is() ) { - // source options are not available for external sources - //! use XPropertySetInfo to test for availability? + // source options are not available for external sources + //! use XPropertySetInfo to test for availability? try { @@ -1105,9 +1105,9 @@ void ScDPSaveData::WriteToSource( const uno::ReferenceGetName(); DBG_TRACESTR(pDim->GetName()); - + BOOL bData = pDim->IsDataLayout(); - //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!! + //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!! uno::Reference xDimsName = xSource->getDimensions(); uno::Reference xIntDims = new ScNameToIndexAccess( xDimsName ); @@ -1138,7 +1138,7 @@ void ScDPSaveData::WriteToSource( const uno::ReferenceGetName(); // different name for each duplication of a (real) dimension... - for (long j=0; j<=i; j++) //! Test !!!!!! - aNewName += '*'; //! modify name at creation of SaveDimension + for (long j=0; j<=i; j++) //! Test !!!!!! + aNewName += '*'; //! modify name at creation of SaveDimension uno::Reference xCloneable( xIntDim, uno::UNO_QUERY ); DBG_ASSERT( xCloneable.is(), "cannot clone dimension" ); @@ -1203,7 +1203,7 @@ BOOL ScDPSaveData::IsEmpty() const if ( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_HIDDEN && !pDim->IsDataLayout() ) return FALSE; } - return TRUE; // no entries that are not hidden + return TRUE; // no entries that are not hidden } ScDPDimensionSaveData* ScDPSaveData::GetDimensionData() @@ -1346,13 +1346,13 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< return; SCCOL nSrcDim = pCache->GetDimensionIndex( GetName() ); - + if ( nSrcDim == -1 ) return; if ( pSelectedPage ) {//check pSelected page DBG_TRACESTR( (*pSelectedPage) ); - if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 ) + if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 ) { delete pSelectedPage; pSelectedPage = NULL; @@ -1361,8 +1361,8 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< }; if ( pReferenceValue && pReferenceValue->ReferenceItemType == DataPilotFieldReferenceItemType::NAMED ) - {//check pReferenceValue -#ifdef DEBUG + {//check pReferenceValue +#ifdef DEBUG switch( pReferenceValue->ReferenceType) { case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE: //both @@ -1398,7 +1398,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< { //running total has not reference item const String& sReferenceItemName = pReferenceValue->ReferenceItemName; DBG_TRACESTR( sReferenceItemName ); - if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 ) + if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 ) bValid = false; } if ( !bValid ) @@ -1421,7 +1421,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< const String& sFieldDimName = pSortInfo->Field; std::list::const_iterator iter = std::find( deletedDims.begin(), deletedDims.end(), sFieldDimName ); if ( iter != deletedDims.end() && pCache->GetDimensionIndex( sFieldDimName ) == -1 ) - { + { pSortInfo->Mode = DataPilotFieldSortMode::MANUAL; pSortInfo->Field = GetName(); } @@ -1434,7 +1434,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< const String& sFieldDimName = pAutoShowInfo->DataField; std::list::const_iterator iter = std::find( deletedDims.begin(), deletedDims.end(), sFieldDimName ); if ( iter != deletedDims.end() && pCache->GetDimensionIndex( sFieldDimName ) == -1 ) - { + { delete pAutoShowInfo; pAutoShowInfo = NULL; } @@ -1446,10 +1446,10 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< for (MemberList::iterator i=maMemberList.begin(); i != maMemberList.end() ; ) { rtl::OUString aMemberName = (*i)->GetName(); - if ( pCache->GetIdByItemData( nSrcDim, aMemberName ) == -1 ) + if ( pCache->GetIdByItemData( nSrcDim, aMemberName ) == -1 ) i = maMemberList.erase( i ); else - i++; + i++; } } } @@ -1460,15 +1460,15 @@ bool operator == (const ::com::sun::star::sheet::DataPilotFieldSortInfo &l, cons } bool operator == (const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &l, const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &r ) { - return l.IsEnabled == r.IsEnabled && - l.ShowItemsMode == r.ShowItemsMode && + return l.IsEnabled == r.IsEnabled && + l.ShowItemsMode == r.ShowItemsMode && l.ItemCount == r.ItemCount && l.DataField == r.DataField; } bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, const ::com::sun::star::sheet::DataPilotFieldReference &r ) { - return l.ReferenceType == r.ReferenceType && - l.ReferenceField == r.ReferenceField && + return l.ReferenceType == r.ReferenceType && + l.ReferenceField == r.ReferenceField && l.ReferenceItemType == r.ReferenceItemType && l.ReferenceItemName == r.ReferenceItemName; } diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index b966d9d458ea..0d4a1af94a91 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -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 @@ -68,13 +68,13 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; -#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" +#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" +#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" -//! move to a header file? -#define SC_DBPROP_DATASOURCENAME "DataSourceName" -#define SC_DBPROP_COMMAND "Command" -#define SC_DBPROP_COMMANDTYPE "CommandType" +//! move to a header file? +#define SC_DBPROP_DATASOURCENAME "DataSourceName" +#define SC_DBPROP_COMMAND "Command" +#define SC_DBPROP_COMMANDTYPE "CommandType" // ----------------------------------------------------------------------- // Wang Xu Ming -- 2009-9-15 // DataPilot Migration - Cache&&Performance @@ -83,7 +83,7 @@ using ::com::sun::star::uno::UNO_QUERY; ScDPTableDataCache* pCache = NULL; ScDPCollection* pDPCollection= pDoc->GetDPCollection(); USHORT nCount = pDPCollection->GetCount(); - + for ( short i=nCount-1; i>=0 ; i--) { if ( const ScImportSourceDesc* pUsedDesc = (*pDPCollection)[i]->GetImportSourceDesc() ) @@ -105,7 +105,7 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID return NULL; sal_Int32 nSdbType = -1; - + switch ( nType ) { case sheet::DataImportMode_SQL: nSdbType = sdb::CommandType::COMMAND; break; @@ -123,7 +123,7 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID if ( pCache == NULL ) pCache = new ScDPTableDataCache( pDoc ); - + uno::Reference xRowSet ; try { @@ -195,7 +195,7 @@ ScDPTableDataCache* ScImportSourceDesc::GetCache( ScDocument* pDoc, long nID ) c if ( NULL == pCache && pDoc ) pCache = GetExistDPObjectCache( pDoc); if ( NULL == pCache ) - pCache = CreateCache( pDoc , nID ); + pCache = CreateCache( pDoc , nID ); return pCache; } @@ -204,7 +204,7 @@ long ScImportSourceDesc:: GetCacheId( ScDocument* pDoc, long nID ) const ScDPTableDataCache* pCache = GetCache( pDoc, nID); if ( NULL == pCache ) return -1; - else + else return pCache->GetId(); } @@ -225,7 +225,7 @@ ScDatabaseDPData::~ScDatabaseDPData() void ScDatabaseDPData::DisposeData() { - //! use OpenDatabase here? + //! use OpenDatabase here? aCacheTable.clear(); } @@ -241,7 +241,7 @@ String ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) { - //! different internal and display names? + //! different internal and display names? //return "Data"; return ScGlobal::GetRscString(STR_PIVOT_DATA); } @@ -257,14 +257,14 @@ BOOL ScDatabaseDPData::getIsDataLayoutDimension(long nColumn) BOOL ScDatabaseDPData::IsDateDimension(long /* nDim */) { - //! later... + //! later... return FALSE; } void ScDatabaseDPData::SetEmptyFlags( BOOL /* bIgnoreEmptyRows */, BOOL /* bRepeatIfEmpty */ ) { - // not used for database data - //! disable flags + // not used for database data + //! disable flags } void ScDatabaseDPData::CreateCacheTable() diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index a1fa9d2d60a6..6bdf5170cd01 100755 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -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 @@ -115,7 +115,7 @@ String ScSheetDPData::getDimensionName(long nColumn) CreateCacheTable(); if (getIsDataLayoutDimension(nColumn)) { - //! different internal and display names? + //! different internal and display names? //return "Data"; return ScGlobal::GetRscString(STR_PIVOT_DATA); } @@ -164,16 +164,16 @@ ULONG ScSheetDPData::GetNumberFormat(long nDim) else { return GetCacheTable().GetCache()->GetNumberFormat( nDim ); - } + } } -UINT32 ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx ) +UINT32 ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx ) { if( !mpDoc ) return 0; if ( SvNumberFormatter* pFormatter = mpDoc->GetFormatTable() ) return pFormatter->GetFormatIndex( eIdx, LANGUAGE_SYSTEM ); - + return 0; } @@ -201,7 +201,7 @@ void ScSheetDPData::CreateCacheTable() // already cached. return; - aCacheTable.fillTable( aQuery, pSpecial, + aCacheTable.fillTable( aQuery, pSpecial, bIgnoreEmptyRows, bRepeatIfEmpty ); } @@ -273,7 +273,7 @@ ScDPTableDataCache* ScSheetSourceDesc::GetCache( ScDocument* pDoc, long nID ) co if ( NULL == pCache && pDoc ) pCache = GetExistDPObjectCache( pDoc ); if ( NULL == pCache ) - pCache = CreateCache( pDoc ); + pCache = CreateCache( pDoc ); return pCache; } @@ -282,7 +282,7 @@ long ScSheetSourceDesc:: GetCacheId( ScDocument* pDoc, long nID ) const ScDPTableDataCache* pCache = GetCache( pDoc, nID); if ( NULL == pCache ) return -1; - else + else return pCache->GetId(); } @@ -295,11 +295,11 @@ ULONG ScSheetSourceDesc::CheckValidate( ScDocument* pDoc ) const { if ( pDoc->IsBlockEmpty( aSrcRange.aStart.Tab(), i, aSrcRange.aStart.Row(),i, aSrcRange.aStart.Row())) - return STR_PIVOT_FIRSTROWEMPTYERR; + return STR_PIVOT_FIRSTROWEMPTYERR; } if( pDoc->IsBlockEmpty( aSrcRange.aStart.Tab(), aSrcRange.aStart.Col(), aSrcRange.aStart.Row()+1, aSrcRange.aEnd.Col(), aSrcRange.aEnd.Row() ) ) { - return STR_PIVOT_ONLYONEROWERR; + return STR_PIVOT_ONLYONEROWERR; } return 0; } diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index cb68732a237f..7ae5fb453a3e 100755 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -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 @@ -65,9 +65,9 @@ ScDPTableData::ScDPTableData(ScDocument* pDoc, long nCacheId ) : mnCacheId( nCacheId ), mpDoc ( pDoc ) { - nLastDateVal = nLastHier = nLastLevel = nLastRet = -1; // invalid + nLastDateVal = nLastHier = nLastLevel = nLastRet = -1; // invalid - //! reset before new calculation (in case the base date is changed) + //! reset before new calculation (in case the base date is changed) } ScDPTableData::~ScDPTableData() @@ -79,7 +79,7 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) if ( nDateVal == nLastDateVal && nHierarchy == nLastHier && nLevel == nLastLevel ) return nLastRet; - Date aDate( 30,12,1899 ); //! get from source data (and cache here) + Date aDate( 30,12,1899 ); //! get from source data (and cache here) aDate += nDateVal; long nRet = 0; @@ -88,10 +88,10 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) case SC_DAPI_HIERARCHY_QUARTER: switch (nLevel) { - case 0: nRet = aDate.GetYear(); break; - case 1: nRet = (aDate.GetMonth()-1) / 3 + 1; break; - case 2: nRet = aDate.GetMonth(); break; - case 3: nRet = aDate.GetDay(); break; + case 0: nRet = aDate.GetYear(); break; + case 1: nRet = (aDate.GetMonth()-1) / 3 + 1; break; + case 2: nRet = aDate.GetMonth(); break; + case 3: nRet = aDate.GetDay(); break; default: DBG_ERROR("GetDatePart: wrong level"); } @@ -99,10 +99,10 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) case SC_DAPI_HIERARCHY_WEEK: switch (nLevel) { - //! use settings for different definitions - case 0: nRet = aDate.GetYear(); break; //!... - case 1: nRet = aDate.GetWeekOfYear(); break; - case 2: nRet = (long)aDate.GetDayOfWeek(); break; + //! use settings for different definitions + case 0: nRet = aDate.GetYear(); break; //!... + case 1: nRet = aDate.GetWeekOfYear(); break; + case 2: nRet = (long)aDate.GetDayOfWeek(); break; default: DBG_ERROR("GetDatePart: wrong level"); } @@ -112,9 +112,9 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) } nLastDateVal = nDateVal; - nLastHier = nHierarchy; - nLastLevel = nLevel; - nLastRet = nRet; + nLastHier = nHierarchy; + nLastLevel = nLevel; + nLastRet = nRet; return nRet; } @@ -126,7 +126,7 @@ bool ScDPTableData::IsRepeatIfEmpty() ULONG ScDPTableData::GetNumberFormat(long) { - return 0; // default format + return 0; // default format } BOOL ScDPTableData::IsBaseForGroup(long) const @@ -157,7 +157,7 @@ BOOL ScDPTableData::HasCommonElement( const ScDPItemData&, long, DBG_ERROR("HasCommonElement shouldn't be called for non-group data"); return FALSE; } -void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTable& rCacheTable, +void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTable& rCacheTable, const CalcInfo& rInfo, CalcRowData& rData) { // column dimensions @@ -188,7 +188,7 @@ void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTab void ScDPTableData::ProcessRowData(CalcInfo& rInfo, CalcRowData& rData, bool bAutoShow) { // Wang Xu Ming -- 2009-6-16 - // DataPilot Migration + // DataPilot Migration if (!bAutoShow) { LateInitParams aColParams( rInfo.aColDims, rInfo.aColLevels, FALSE ); @@ -217,7 +217,7 @@ void ScDPTableData::ProcessRowData(CalcInfo& rInfo, CalcRowData& rData, bool bAu // End Comments } - rInfo.pRowRoot->ProcessData(rData.aRowData, rInfo.pColRoot->GetChildDimension(), + rInfo.pRowRoot->ProcessData(rData.aRowData, rInfo.pColRoot->GetChildDimension(), rData.aColData, rData.aValues); } } @@ -238,7 +238,7 @@ void ScDPTableData::CalcResultsFromCacheTable(const ScDPCacheTable& rCacheTable, // Wang Xu Ming -- 2009-6-10 // DataPilot Migration -void ScDPTableData::GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, +void ScDPTableData::GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, const vector& rDims, vector< SCROW/*ScDPItemData*/>& rItemData) // End Comments { @@ -283,7 +283,7 @@ const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex ) { if ( nIndex >= GetMembersCount( nDim ) ) return NULL; - + const ::std::vector& nMembers = GetCacheTable().getFieldEntries( nDim ); return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nMembers[nIndex] ); @@ -291,16 +291,16 @@ const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex ) const ScDPItemData* ScDPTableData::GetMemberById( long nDim, long nId) { - + return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nId); } -SCROW ScDPTableData::GetIdOfItemData( long nDim, const ScDPItemData& rData ) +SCROW ScDPTableData::GetIdOfItemData( long nDim, const ScDPItemData& rData ) { return GetCacheTable().GetCache()->GetIdByItemData((SCCOL) nDim, rData ); } -const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn ) +const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn ) { return GetCacheTable().getFieldEntries( nColumn ); } @@ -313,16 +313,16 @@ long ScDPTableData::GetSourceDim( long nDim ) long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2) { - if ( getIsDataLayoutDimension(nDim) ) + if ( getIsDataLayoutDimension(nDim) ) return 0; - long n1 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId1); - long n2 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId2); - if ( n1 > n2 ) - return 1; - else if ( n1 == n2 ) - return 0; - else + long n1 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId1); + long n2 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId2); + if ( n1 > n2 ) + return 1; + else if ( n1 == n2 ) + return 0; + else return -1; } // End Comments diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx index 8f25b70e41b6..f350e86496a0 100755 --- a/sc/source/core/data/dptablecache.cxx +++ b/sc/source/core/data/dptablecache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -57,7 +57,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; // ----------------------------------------------------------------------- -namespace +namespace { BOOL lcl_isDate( ULONG nNumType ) { @@ -91,7 +91,7 @@ namespace rIndex = nLo; return bFound; } - + ScDPItemData* lcl_GetItemValue(const Reference& xRow, sal_Int32 nType, long nCol, const Date& rNullDate ) { @@ -106,7 +106,7 @@ namespace case sdbc::DataType::BOOLEAN: { nNumType = NUMBERFORMAT_LOGICAL; - fValue = xRow->getBoolean(nCol) ? 1 : 0; + fValue = xRow->getBoolean(nCol) ? 1 : 0; return new ScDPItemData( rStr, fValue,TRUE,nNumType); } //break; @@ -186,7 +186,7 @@ namespace ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, BOOL bHV/* = FALSE*/, const ULONG nNumFormatP /*= 0*/ , BOOL bData/* = TRUE*/) : nNumFormat( nNumFormatP ), aString(rS), fValue(fV), mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!FALSE) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) ) -{ +{ } ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ): @@ -194,9 +194,9 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD { String aDocStr; pDoc->GetString( nCol, nRow, nDocTab, aDocStr ); - + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - + ScAddress aPos( nCol, nRow, nDocTab ); ScBaseCell* pCell = pDoc->GetCell( aPos ); @@ -223,7 +223,7 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD BOOL ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const { //TODO: indified Date? //! pass Transliteration? - //! inline? + //! inline? return IsValue() ? ( r.IsValue() && rtl::math::approxEqual( fValue, r.fValue ) ) : ( !r.IsValue() && ScGlobal::GetpTransliteration()->isEqual( aString, r.aString ) ); @@ -251,7 +251,7 @@ BOOL ScDPItemData::operator==( const ScDPItemData& r ) const // Identify date if ( IsDate() != r.IsDate() ) return FALSE; - else + else if ( r.IsValue() ) return rtl::math::approxEqual( fValue, r.fValue ); else @@ -299,7 +299,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA, // //Wang Xu Ming SODC_17561 #ifdef DEBUG -void ScDPItemData::dump() const +void ScDPItemData::dump() const { DBG_TRACE1( "Numberformat= %o", nNumFormat ); DBG_TRACESTR(aString ); @@ -319,64 +319,64 @@ TypedStrData* ScDPItemData::CreateTypeString( ) sal_uInt8 ScDPItemData::GetType() const { - + if ( IsHasErr() ) return SC_VALTYPE_ERROR; else if ( !IsHasData() ) return SC_VALTYPE_EMPTY; else if ( IsValue()) return SC_VALTYPE_VALUE; - else + else return SC_VALTYPE_STRING; } -BOOL ScDPItemData::IsHasData() const +BOOL ScDPItemData::IsHasData() const { return !!(mbFlag&MK_DATA); } -BOOL ScDPItemData::IsHasErr() const -{ - return !!(mbFlag&MK_ERR); +BOOL ScDPItemData::IsHasErr() const +{ + return !!(mbFlag&MK_ERR); } -BOOL ScDPItemData::IsValue() const -{ +BOOL ScDPItemData::IsValue() const +{ return !!(mbFlag&MK_VAL); } -String ScDPItemData::GetString() const -{ +String ScDPItemData::GetString() const +{ return aString; } -double ScDPItemData::GetValue() const -{ +double ScDPItemData::GetValue() const +{ return fValue; } -ULONG ScDPItemData::GetNumFormat() const -{ +ULONG ScDPItemData::GetNumFormat() const +{ return nNumFormat; } -BOOL ScDPItemData::HasStringData() const +BOOL ScDPItemData::HasStringData() const -{ +{ return IsHasData()&&!IsHasErr()&&!IsValue(); } BOOL ScDPItemData::IsDate() const -{ - return !!(mbFlag&MK_DATE); +{ + return !!(mbFlag&MK_DATE); } BOOL ScDPItemData::HasDatePart() const { - return !!(mbFlag&MK_DATEPART); + return !!(mbFlag&MK_DATEPART); } -void ScDPItemData::SetDate( BOOL b ) +void ScDPItemData::SetDate( BOOL b ) { - b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE ); + b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE ); } // ----------------------------------------------------------------------- @@ -388,7 +388,7 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const if ( GetColumnCount() == r.GetColumnCount() ) { for ( SCCOL i = 0 ; i < GetColumnCount(); i++ ) - { //check dim names + { //check dim names if ( GetDimensionName( i ) != r.GetDimensionName( i ) ) return FALSE; //check rows count @@ -402,12 +402,12 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const { if ( *( GetDimMemberValues( i )[j] ) == *( r.GetDimMemberValues( i )[j] ) ) continue; - else + else return FALSE; } } - else - return FALSE; + else + return FALSE; //check source table index for ( SCROW k=0 ; k < GetRowCount(); k ++ ) { @@ -415,7 +415,7 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const continue; else return FALSE; - } + } } } return TRUE; @@ -444,7 +444,7 @@ ScDPTableDataCache::~ScDPTableDataCache() for ( ULONG row = 0 ; row < mpTableDataValues[nCol].size(); row++ ) delete mpTableDataValues[nCol][row]; } - for ( nCol =0; nCol < mrLabelNames.size(); nCol++ ) + for ( nCol =0; nCol < mrLabelNames.size(); nCol++ ) delete mrLabelNames[nCol]; // End Comments @@ -462,15 +462,15 @@ ScDPTableDataCache::~ScDPTableDataCache() // ----------------------------------------------------------------------- void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount ) -{ +{ DBG_ASSERT( pRow , " empty pointer" ); if ( !mrLabelNames.size() ) { mnColumnCount= nCount; mpTableDataValues = new std::vector[ mnColumnCount ]; - mpSourceData = new std::vector[ mnColumnCount ]; - mpGlobalOrder = new std::vector[ mnColumnCount ]; - mpIndexOrder = new std::vector[ mnColumnCount ]; + mpSourceData = new std::vector[ mnColumnCount ]; + mpGlobalOrder = new std::vector[ mnColumnCount ]; + mpIndexOrder = new std::vector[ mnColumnCount ]; for ( USHORT i = 0; i < nCount ; i ++ ) AddLabel( new ScDPItemData( pRow[i] ) ); @@ -492,10 +492,10 @@ bool ScDPTableDataCache::IsValid() const namespace { -/** - * While the macro interpret level is incremented, the formula cells are - * (semi-)guaranteed to be interpreted. - */ +/** + * While the macro interpret level is incremented, the formula cells are + * (semi-)guaranteed to be interpreted. + */ class MacroInterpretIncrementer { public: @@ -517,20 +517,20 @@ private: // ----------------------------------------------------------------------- bool ScDPTableDataCache::InitFromDoc( ScDocument* pDoc, const ScRange& rRange ) { - // Make sure the formula cells within the data range are interpreted + // Make sure the formula cells within the data range are interpreted // during this call, for this method may be called from the interpretation // of GETPIVOTDATA, which disables nested formula interpretation without // increasing the macro level. MacroInterpretIncrementer aMacroInc(pDoc); // - SCROW nStartRow = rRange.aStart.Row(); // start of data + SCROW nStartRow = rRange.aStart.Row(); // start of data SCROW nEndRow = rRange.aEnd.Row(); USHORT nStartCol = rRange.aStart.Col(); USHORT nEndCol = rRange.aEnd.Col(); USHORT nDocTab = rRange.aStart.Tab(); - - //init + + //init long nOldColumCount = mnColumnCount; mnColumnCount = nEndCol - nStartCol + 1; if ( IsValid() ) @@ -547,11 +547,11 @@ bool ScDPTableDataCache::InitFromDoc( ScDocument* pDoc, const ScRange& rRange ) delete [] mpIndexOrder; mrLabelNames.clear(); } - + mpTableDataValues = new std::vector[ mnColumnCount ]; - mpSourceData = new std::vector[ mnColumnCount ]; - mpGlobalOrder = new std::vector[ mnColumnCount ]; - mpIndexOrder = new std::vector[ mnColumnCount ]; + mpSourceData = new std::vector[ mnColumnCount ]; + mpGlobalOrder = new std::vector[ mnColumnCount ]; + mpIndexOrder = new std::vector[ mnColumnCount ]; //check valid for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow ++ ) { @@ -598,9 +598,9 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference& xRowS // Get column titles and types. mrLabelNames.reserve(mnColumnCount); mpTableDataValues = new std::vector[ mnColumnCount ]; - mpSourceData = new std::vector[ mnColumnCount ]; - mpGlobalOrder = new std::vector[ mnColumnCount ]; - mpIndexOrder = new std::vector[ mnColumnCount ]; + mpSourceData = new std::vector[ mnColumnCount ]; + mpGlobalOrder = new std::vector[ mnColumnCount ]; + mpIndexOrder = new std::vector[ mnColumnCount ]; std::vector aColTypes(mnColumnCount); @@ -615,7 +615,7 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference& xRowS Reference xRow(xRowSet, UNO_QUERY_THROW); xRowSet->first(); do - { + { for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol) { ScDPItemData * pNew = lcl_GetItemValue( xRow, aColTypes[nCol], nCol+1, rNullDate ); @@ -646,12 +646,12 @@ ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const } // ----------------------------------------------------------------------- -bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial) +bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial) { //Copied and modified from ScTable::ValidQuery if (!rParam.GetEntry(0).bDoQuery) return TRUE; - BOOL bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell(); - + BOOL bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell(); + //--------------------------------------------------------------- const SCSIZE nFixedBools = 32; @@ -661,8 +661,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] ); BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] ); - long nPos = -1; - SCSIZE i = 0; + long nPos = -1; + SCSIZE i = 0; CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() : ScGlobal::GetCollator() ); ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ? @@ -672,8 +672,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO { ScQueryEntry& rEntry = rParam.GetEntry(i); // we can only handle one single direct query - SCROW nId = GetItemDataId( (SCCOL)rEntry.nField, nRow, FALSE ); - const ScDPItemData* pCellData = GetItemDataById( (SCCOL)rEntry.nField, nId); + SCROW nId = GetItemDataId( (SCCOL)rEntry.nField, nRow, FALSE ); + const ScDPItemData* pCellData = GetItemDataById( (SCCOL)rEntry.nField, nId); BOOL bOk = FALSE; BOOL bTestEqual = FALSE; @@ -686,9 +686,9 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO bOk = pCellData->IsHasData(); } else if ( !rEntry.bQueryByString && pCellData->IsValue() ) - { // by Value + { // by Value double nCellVal = pCellData->GetValue(); - + switch (rEntry.eOp) { case SC_EQUAL : @@ -718,8 +718,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO || (rEntry.bQueryByString && pCellData->HasStringData() ) ) - { // by String - String aCellStr = pCellData->GetString(); + { // by String + String aCellStr = pCellData->GetString(); BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL) || (rEntry.eOp == SC_NOT_EQUAL))); @@ -859,7 +859,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO // ----------------------------------------------------------------------- bool ScDPTableDataCache::IsRowEmpty( SCROW nRow ) const { - return mbEmptyRow[ nRow ]; + return mbEmptyRow[ nRow ]; } @@ -873,10 +873,10 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData) { DBG_ASSERT( IsValid(), " IsValid() == false " ); DBG_ASSERT( nDim < mnColumnCount && nDim >=0 , "dimension out of bound" ); - SCROW nIndex = 0; - - BOOL bInserted = FALSE; + SCROW nIndex = 0; + BOOL bInserted = FALSE; + pitemData->SetDate( lcl_isDate( GetNumType( pitemData->nNumFormat ) ) ); if ( !lcl_Search( mpTableDataValues[nDim], mpGlobalOrder[nDim], *pitemData, nIndex ) ) @@ -898,7 +898,7 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData) if ( pitemData->IsHasData() ) mbEmptyRow[ nCurRow ] = FALSE; - if ( !bInserted ) + if ( !bInserted ) delete pitemData; return TRUE; @@ -910,7 +910,7 @@ String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const DBG_ASSERT( /* nColumn>=0 && */ nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); DBG_ASSERT( mrLabelNames.size() == static_cast (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); if ( static_cast(nColumn+1) < mrLabelNames.size() ) - { + { return mrLabelNames[nColumn+1]->aString; } else @@ -918,11 +918,11 @@ String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const } void ScDPTableDataCache::AddLabel(ScDPItemData *pData) -{ +{ DBG_ASSERT( IsValid(), " IsValid() == false " ); if ( mrLabelNames.size() == 0 ) - mrLabelNames.push_back( new ScDPItemData( ScGlobal::GetRscString(STR_PIVOT_DATA) ) ); + mrLabelNames.push_back( new ScDPItemData( ScGlobal::GetRscString(STR_PIVOT_DATA) ) ); //reset name if needed @@ -946,7 +946,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData) while ( !bFound ); pData->aString = strNewName; - mrLabelNames.push_back( pData ); + mrLabelNames.push_back( pData ); } SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty) const @@ -955,7 +955,7 @@ SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfE DBG_ASSERT( /* nDim >= 0 && */ nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " ); if ( bRepeatIfEmpty ) - { + { while ( nRow >0 && !mpTableDataValues[nDim][ mpSourceData[nDim][nRow] ]->IsHasData() ) --nRow; } @@ -993,7 +993,7 @@ SCROW ScDPTableDataCache::GetSortedItemDataId(SCCOL nDim, SCROW nOrder) const DBG_ASSERT ( IsValid(), "IsValid"); DBG_ASSERT( nDim>=0 && nDim < mnColumnCount, "nDim < mnColumnCount"); DBG_ASSERT( nOrder >= 0 && (size_t) nOrder < mpGlobalOrder[nDim].size(), "nOrder < mpGlobalOrder[nDim].size()" ); - + return mpGlobalOrder[nDim][nOrder]; } @@ -1016,7 +1016,7 @@ ULONG ScDPTableDataCache::GetNumberFormat( long nDim ) const return mpTableDataValues[nDim][0]->nNumFormat; } -BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const +BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const { if ( nDim >= mnColumnCount ) return false; @@ -1050,7 +1050,7 @@ SCCOL ScDPTableDataCache::GetDimensionIndex(String sName) const } SCROW ScDPTableDataCache::GetIdByItemData(long nDim, String sItemData ) const -{ +{ if ( nDim < mnColumnCount && nDim >=0 ) { for ( size_t n = 0; n< mpTableDataValues[nDim].size(); n++ ) @@ -1059,13 +1059,13 @@ SCROW ScDPTableDataCache::GetIdByItemData(long nDim, String sItemData ) const return n; } } - + ScDPItemData rData ( sItemData ); return GetRowCount() +maAdditionalDatas.getDataId(rData); } SCROW ScDPTableDataCache::GetIdByItemData( long nDim, const ScDPItemData& rData ) const -{ +{ if ( nDim < mnColumnCount && nDim >=0 ) { for ( size_t n = 0; n< mpTableDataValues[nDim].size(); n++ ) @@ -1087,7 +1087,7 @@ SCROW ScDPTableDataCache::GetAdditionalItemID( const ScDPItemData& rData ) { return GetRowCount() + maAdditionalDatas.insertData( rData ); } - + SCROW ScDPTableDataCache::GetOrder(long nDim, SCROW nIndex) const { @@ -1111,15 +1111,15 @@ SCROW ScDPTableDataCache::GetOrder(long nDim, SCROW nIndex) const ScDocument* ScDPTableDataCache::GetDoc() const { - return mpDoc; + return mpDoc; }; -long ScDPTableDataCache::GetColumnCount() const +long ScDPTableDataCache::GetColumnCount() const { - return mnColumnCount; + return mnColumnCount; } -long ScDPTableDataCache::GetId() const +long ScDPTableDataCache::GetId() const { - return mnID; + return mnID; } - + diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index c79f7c1b17a6..aef7a8c7c15f 100755 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -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 @@ -41,12 +41,12 @@ #include "global.hxx" #include "subtotal.hxx" #include "globstr.hrc" -#include "datauno.hxx" // ScDataUnoConversion +#include "datauno.hxx" // ScDataUnoConversion #include "document.hxx" // for DumpState only! #include -#include //! Test !!! +#include //! Test !!! #include #include @@ -72,20 +72,20 @@ SV_IMPL_PTRARR( ScDPDataMembers, ScDPDataMemberPtr ); // ----------------------------------------------------------------------- -static USHORT nFuncStrIds[12] = // passend zum enum ScSubTotalFunc -{ - 0, // SUBTOTAL_FUNC_NONE - STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE - STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT - STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 - STR_FUN_TEXT_MAX, // SUBTOTAL_FUNC_MAX - STR_FUN_TEXT_MIN, // SUBTOTAL_FUNC_MIN - STR_FUN_TEXT_PRODUCT, // SUBTOTAL_FUNC_PROD - STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STD - STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STDP - STR_FUN_TEXT_SUM, // SUBTOTAL_FUNC_SUM - STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR - STR_FUN_TEXT_VAR // SUBTOTAL_FUNC_VARP +static USHORT nFuncStrIds[12] = // passend zum enum ScSubTotalFunc +{ + 0, // SUBTOTAL_FUNC_NONE + STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE + STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT + STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 + STR_FUN_TEXT_MAX, // SUBTOTAL_FUNC_MAX + STR_FUN_TEXT_MIN, // SUBTOTAL_FUNC_MIN + STR_FUN_TEXT_PRODUCT, // SUBTOTAL_FUNC_PROD + STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STD + STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STDP + STR_FUN_TEXT_SUM, // SUBTOTAL_FUNC_SUM + STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR + STR_FUN_TEXT_VAR // SUBTOTAL_FUNC_VARP }; namespace { template < typename T > @@ -95,7 +95,7 @@ namespace { for ( size_t i = 0 ; i < vec.size(); i++ ) { if ( vec[i] ) - delete vec[i]; + delete vec[i]; } vec.resize( nSize, NULL ); } @@ -418,8 +418,8 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { - if (nCount<0) // error? - return; // nothing more... + if (nCount<0) // error? + return; // nothing more... if ( rNext.nType == SC_VALTYPE_EMPTY ) return; @@ -433,35 +433,35 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons if ( eFunc == SUBTOTAL_FUNC_NONE ) return; - if ( eFunc != SUBTOTAL_FUNC_CNT2 ) // CNT2 counts everything, incl. strings and errors + if ( eFunc != SUBTOTAL_FUNC_CNT2 ) // CNT2 counts everything, incl. strings and errors { if ( rNext.nType == SC_VALTYPE_ERROR ) { - nCount = -1; // -1 for error (not for CNT2) + nCount = -1; // -1 for error (not for CNT2) return; } if ( rNext.nType == SC_VALTYPE_STRING ) - return; // ignore + return; // ignore } - ++nCount; // for all functions + ++nCount; // for all functions switch (eFunc) { case SUBTOTAL_FUNC_SUM: case SUBTOTAL_FUNC_AVE: if ( !SubTotal::SafePlus( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error break; case SUBTOTAL_FUNC_PROD: - if ( nCount == 1 ) // copy first value (fVal is initialized to 0) + if ( nCount == 1 ) // copy first value (fVal is initialized to 0) fVal = rNext.fValue; else if ( !SubTotal::SafeMult( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error break; case SUBTOTAL_FUNC_CNT: case SUBTOTAL_FUNC_CNT2: - // nothing more than incrementing nCount + // nothing more than incrementing nCount break; case SUBTOTAL_FUNC_MAX: if ( nCount == 1 || rNext.fValue > fVal ) @@ -478,11 +478,11 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons { // fAux is used to sum up squares if ( !SubTotal::SafePlus( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error double fAdd = rNext.fValue; if ( !SubTotal::SafeMult( fAdd, rNext.fValue ) || !SubTotal::SafePlus( fAux, fAdd ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error } break; default: @@ -492,8 +492,8 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { - // calculate the original result - // (without reference value, used as the basis for reference value calculation) + // calculate the original result + // (without reference value, used as the basis for reference value calculation) // called several times at the cross-section of several subtotals - don't calculate twice then if ( IsCalculated() ) @@ -508,7 +508,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub return; } - // check the error conditions for the selected function + // check the error conditions for the selected function BOOL bError = FALSE; switch (eFunc) @@ -517,7 +517,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_PROD: case SUBTOTAL_FUNC_CNT: case SUBTOTAL_FUNC_CNT2: - bError = ( nCount < 0 ); // only real errors + bError = ( nCount < 0 ); // only real errors break; case SUBTOTAL_FUNC_AVE: @@ -525,19 +525,19 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_MIN: case SUBTOTAL_FUNC_STDP: case SUBTOTAL_FUNC_VARP: - bError = ( nCount <= 0 ); // no data is an error + bError = ( nCount <= 0 ); // no data is an error break; case SUBTOTAL_FUNC_STD: case SUBTOTAL_FUNC_VAR: - bError = ( nCount < 2 ); // need at least 2 values + bError = ( nCount < 2 ); // need at least 2 values break; default: DBG_ERROR("invalid function"); } - // calculate the selected function + // calculate the selected function double fResult = 0.0; if ( !bError ) @@ -548,7 +548,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_MIN: case SUBTOTAL_FUNC_SUM: case SUBTOTAL_FUNC_PROD: - // different error conditions are handled above + // different error conditions are handled above fResult = fVal; break; @@ -562,7 +562,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub fResult = fVal / (double) nCount; break; - //! use safe mul for fVal * fVal + //! use safe mul for fVal * fVal case SUBTOTAL_FUNC_STD: if ( nCount >= 2 ) @@ -585,13 +585,13 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub } } - BOOL bEmpty = ( nCount == 0 ); // no data + BOOL bEmpty = ( nCount == 0 ); // no data - // store the result - // Empty is checked first, so empty results are shown empty even for "average" etc. - // If these results should be treated as errors in reference value calculations, - // a separate state value (EMPTY_ERROR) is needed. - // Now, for compatibility, empty "average" results are counted as 0. + // store the result + // Empty is checked first, so empty results are shown empty even for "average" etc. + // If these results should be treated as errors in reference value calculations, + // a separate state value (EMPTY_ERROR) is needed. + // Now, for compatibility, empty "average" results are counted as 0. if ( bEmpty ) nCount = SC_DPAGG_RESULT_EMPTY; @@ -601,11 +601,11 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub nCount = SC_DPAGG_RESULT_VALID; if ( bEmpty || bError ) - fResult = 0.0; // default, in case the state is later modified + fResult = 0.0; // default, in case the state is later modified // fprintf(stdout, "ScDPAggData::Calculate: result = %g\n", fResult);fflush(stdout); - fVal = fResult; // used directly from now on - fAux = 0.0; // used for running total or original result of reference value + fVal = fResult; // used directly from now on + fAux = 0.0; // used for running total or original result of reference value } BOOL ScDPAggData::IsCalculated() const @@ -740,7 +740,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) ScSubTotalFunc eRet = SUBTOTAL_FUNC_NONE; if ( pLevel ) { - //! direct access via ScDPLevel + //! direct access via ScDPLevel uno::Sequence aSeq = pLevel->getSubTotals(); long nSequence = aSeq.getLength(); @@ -765,7 +765,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) // ----------------------------------------------------------------------- -ScDPResultData::ScDPResultData( ScDPSource* pSrc ) : //! Ref +ScDPResultData::ScDPResultData( ScDPSource* pSrc ) : //! Ref pSource( pSrc ), nMeasCount( 0 ), pMeasFuncs( NULL ), @@ -815,11 +815,11 @@ void ScDPResultData::SetMeasureData( long nCount, const ScSubTotalFunc* pFunctio } else { - // use one dummy measure + // use one dummy measure nMeasCount = 1; pMeasFuncs = new ScSubTotalFunc[1]; pMeasFuncs[0] = SUBTOTAL_FUNC_NONE; - pMeasRefs = new sheet::DataPilotFieldReference[1]; // default ctor is ok + pMeasRefs = new sheet::DataPilotFieldReference[1]; // default ctor is ok pMeasRefOrient = new USHORT[1]; pMeasRefOrient[0] = sheet::DataPilotFieldOrientation_HIDDEN; pMeasNames = new String[1]; @@ -870,13 +870,13 @@ USHORT ScDPResultData::GetMeasureRefOrient(long nMeasure) const String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const { - // with bForce==TRUE, return function instead of "result" for single measure - // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc + // with bForce==TRUE, return function instead of "result" for single measure + // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc rbTotalResult = false; if ( nMeasure < 0 || ( nMeasCount == 1 && !bForce && eForceFunc == SUBTOTAL_FUNC_NONE ) ) { - // for user-specified subtotal function with all measures, - // display only function name + // for user-specified subtotal function with all measures, + // display only function name if ( eForceFunc != SUBTOTAL_FUNC_NONE ) return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]); @@ -899,10 +899,10 @@ String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFu USHORT nId = nFuncStrIds[eFunc]; if (nId) { - aRet += ScGlobal::GetRscString(nId); // function name + aRet += ScGlobal::GetRscString(nId); // function name aRet.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " - " )); } - aRet += pMeasNames[nMeasure]; // field name + aRet += pMeasNames[nMeasure]; // field name return aRet; } @@ -940,7 +940,7 @@ BOOL ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex const ScDPItemData* pData = pSource->GetItemDataById( nGroupIndex , nBaseDataId); if ( pData ) return pSource->GetData()->IsInGroup( rGroupData, nGroupIndex, *pData , nBaseIndex ); - else + else return FALSE; } BOOL ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex, @@ -949,7 +949,7 @@ BOOL ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex, const ScDPItemData* pGroupData = pSource->GetItemDataById( nGroupIndex , nGroupDataId); if ( pGroupData ) return pSource->GetData()->IsInGroup( *pGroupData, nGroupIndex, rBaseData , nBaseIndex ); - else + else return FALSE; } @@ -968,17 +968,17 @@ const ScDPSource* ScDPResultData::GetSource() const return pSource; } -ResultMembers* ScDPResultData::GetDimResultMembers( long nDim , ScDPDimension* pDim, ScDPLevel* pLevel) const +ResultMembers* ScDPResultData::GetDimResultMembers( long nDim , ScDPDimension* pDim, ScDPLevel* pLevel) const { - if ( mpDimMembers[ nDim ] == NULL ) + if ( mpDimMembers[ nDim ] == NULL ) { - //long nDimSource = pDim->GetDimension(); - + //long nDimSource = pDim->GetDimension(); + ResultMembers* pResultMembers = new ResultMembers(); // global order is used to initialize aMembers, so it doesn't have to be looked at later const ScMemberSortOrder& rGlobalOrder = pLevel->GetGlobalOrder(); - + ScDPMembers* pMembers = pLevel->GetMembersObject(); long nMembCount = pMembers->getCount(); for ( long i=0; iGetNameStr(); else - return ScGlobal::GetRscString(STR_PIVOT_TOTAL); // root member + return ScGlobal::GetRscString(STR_PIVOT_TOTAL); // root member } void ScDPResultMember::FillItemData( ScDPItemData& rData ) const @@ -1056,7 +1056,7 @@ void ScDPResultMember::FillItemData( ScDPItemData& rData ) const BOOL ScDPResultMember::IsNamedItem( SCROW nIndex ) const { - //! store ScDPMember pointer instead of ScDPMember ??? + //! store ScDPMember pointer instead of ScDPMember ??? const ScDPMember* pMemberDesc = GetDPMember(); if (pMemberDesc) return ((ScDPMember*)pMemberDesc)->IsNamedItem( nIndex ); @@ -1082,11 +1082,11 @@ bool ScDPResultMember::IsValidEntry( const vector< SCROW >& aMembers ) const return true; } -void ScDPResultMember::InitFrom( const vector& ppDim, const vector& ppLev, +void ScDPResultMember::InitFrom( const vector& ppDim, const vector& ppLev, size_t nPos, ScDPInitState& rInitState , BOOL bInitChild /*= TRUE */) { - // with LateInit, initialize only those members that have data + // with LateInit, initialize only those members that have data if ( pResultData->IsLateInit() ) return; @@ -1095,7 +1095,7 @@ void ScDPResultMember::InitFrom( const vector& ppDim, const vect if (nPos >= ppDim.size()) return; - // skip child dimension if details are not shown + // skip child dimension if details are not shown if ( GetDPMember() && !GetDPMember()->getShowDetails() ) { // Wang Xu Ming -- 2009-6-16 @@ -1110,17 +1110,17 @@ void ScDPResultMember::InitFrom( const vector& ppDim, const vect pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , FALSE ); return; } - else + else { //find next dim nPos ++; nMemberStep ++; } } // End Comments - bHasHiddenDetails = TRUE; // only if there is a next dimension + bHasHiddenDetails = TRUE; // only if there is a next dimension return; } - + if ( bInitChild ) { pChildDimension = new ScDPResultDimension( pResultData ); @@ -1128,11 +1128,11 @@ void ScDPResultMember::InitFrom( const vector& ppDim, const vect } } -void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector& ppDim, const vector& ppLev*/, +void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector& ppDim, const vector& ppLev*/, const vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ) { - // without LateInit, everything has already been initialized + // without LateInit, everything has already been initialized if ( !pResultData->IsLateInit() ) return; @@ -1142,7 +1142,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vectorgetShowDetails() ) { // Wang Xu Ming -- 2009-6-16 @@ -1164,7 +1164,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vectorIsAddEmpty() ) ++nExtraSpace; @@ -1245,18 +1245,18 @@ long ScDPResultMember::GetSize(long nMeasure) const BOOL ScDPResultMember::IsVisible() const { - // not initialized -> shouldn't be there at all - // (allocated only to preserve ordering) - const ScDPLevel* pParentLevel = GetParentLevel(); + // not initialized -> shouldn't be there at all + // (allocated only to preserve ordering) + const ScDPLevel* pParentLevel = GetParentLevel(); return ( bHasElements || ( pParentLevel && pParentLevel->getShowEmpty() ) ) && IsValid() && bInitialized; } BOOL ScDPResultMember::IsValid() const { - // non-Valid members are left out of calculation + // non-Valid members are left out of calculation - // was member set no invisible at the DataPilotSource? - const ScDPMember* pMemberDesc =GetDPMember(); + // was member set no invisible at the DataPilotSource? + const ScDPMember* pMemberDesc =GetDPMember(); if ( pMemberDesc && !pMemberDesc->getIsVisible() ) return FALSE; @@ -1279,13 +1279,13 @@ long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const if ( pUserSubStart ) *pUserSubStart = 0; // default - const ScDPLevel* pParentLevel = GetParentLevel(); + const ScDPLevel* pParentLevel = GetParentLevel(); - if ( bForceSubTotal ) // set if needed for root members - return 1; // grand total is always "automatic" + if ( bForceSubTotal ) // set if needed for root members + return 1; // grand total is always "automatic" else if ( pParentLevel ) { - //! direct access via ScDPLevel + //! direct access via ScDPLevel uno::Sequence aSeq = pParentLevel->getSubTotals(); long nSequence = aSeq.getLength(); @@ -1327,8 +1327,8 @@ void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const // show only own values if there's no child dimension (innermost). if ( !nUserSubCount || !pChildDimension ) nUserSubCount = 1; - - const ScDPLevel* pParentLevel = GetParentLevel(); + + const ScDPLevel* pParentLevel = GetParentLevel(); for (long nUserPos=0; nUserPos